Files
Arch-R/projects/Generic/linux
Stephan Raue 298b643649 Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next
Conflicts:
	packages/mediacenter/xbmc-frodo/config/advancedsettings.xml
	projects/Fusion/linux/linux.i386.conf
	projects/Fusion/linux/linux.x86_64.conf
	projects/Generic/linux/linux.i386.conf
	projects/Generic_OSS/linux/linux.i386.conf
	projects/ION/linux/linux.i386.conf
	projects/ION/linux/linux.x86_64.conf
	projects/Intel/linux/linux.i386.conf
	projects/Intel/linux/linux.x86_64.conf
2012-10-17 18:15:32 +02:00
..