Files
Arch-R/projects/Generic/linux
Stefan Saraev 9c6e9af0f1 Merge remote-tracking branch 'upstream/master' into openelec-systemd
Conflicts:
	projects/ARCTIC_MC/linux/linux.x86_64.conf
	projects/ATV/linux/linux.i386.conf
	projects/Fusion/linux/linux.i386.conf
	projects/Fusion/linux/linux.x86_64.conf
	projects/Generic/linux/linux.i386.conf
	projects/Generic/linux/linux.x86_64.conf
	projects/Generic_OSS/linux/linux.i386.conf
	projects/ION/linux/linux.x86_64.conf
	projects/Intel/linux/linux.x86_64.conf
	projects/Virtual/linux/linux.i386.conf
	projects/Virtual/linux/linux.x86_64.conf
2013-09-07 22:22:08 +03:00
..