Files
Arch-R/projects/Virtual/linux
Stephan Raue fe8d173d77 Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next
Conflicts:
	packages/linux/unpack
	packages/mediacenter/xbmc-frodo-theme-Confluence/meta
	packages/mediacenter/xbmc-frodo/meta
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-c49247d-321-texturepacker-hostflags-and-rework.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-1c5ca99-001-add_support_to_specify_GIT_REV-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-1c5ca99-303-fix_libdvd_xFLAGS-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-1c5ca99-311-fix_rsxs_build-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-1c5ca99-321-texturepacker-hostflags-and-rework.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-1c5ca99-402-enable_yasm_in_ffmpeg-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-1c5ca99-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-1c5ca99-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-1c5ca99-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-1c5ca99-454-disable_backslash-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-1c5ca99-457-fix_connection_check-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-1c5ca99-462-add_remote_irtrans_mediacenter-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-1c5ca99-463-add_remote_devinput-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-1c5ca99-464-add_eject_keymapping_for_lirc-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-1c5ca99-981-toggleButtonState.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-8f0c91b-001-add_support_to_specify_GIT_REV-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-8f0c91b-303-fix_libdvd_xFLAGS-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-8f0c91b-311-fix_rsxs_build-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-8f0c91b-321-texturepacker-hostflags-and-rework.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-8f0c91b-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-8f0c91b-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-8f0c91b-454-disable_backslash-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-8f0c91b-463-add_remote_devinput-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-8f0c91b-981-toggleButtonState.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.2-001-add_support_to_specify_GIT_REV-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.2-303-fix_libdvd_xFLAGS-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.2-311-fix_rsxs_build-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.2-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.2-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.2-454-disable_backslash-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.2-463-add_remote_devinput-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.2-981-toggleButtonState.patch
	projects/ATV/linux/linux.i386.conf
	projects/ATV/options
	projects/Fusion/linux/linux.i386.conf
	projects/Fusion/linux/linux.x86_64.conf
	projects/Fusion/options
	projects/Generic/linux/linux.i386.conf
	projects/Generic/options
	projects/Generic_OSS/linux/linux.i386.conf
	projects/Generic_OSS/options
	projects/ION/linux/linux.i386.conf
	projects/ION/linux/linux.x86_64.conf
	projects/ION/options
	projects/Intel/linux/linux.i386.conf
	projects/Intel/linux/linux.x86_64.conf
	projects/Intel/options
	projects/RPi/options
	projects/Ultra/linux/linux.x86_64.conf
	projects/Ultra/options
	projects/Virtual/linux/linux.i386.conf
	projects/Virtual/linux/linux.x86_64.conf
	projects/Virtual/options
2012-09-08 00:39:26 +02:00
..