Files
Arch-R/projects
Gujs f089fe2a1e Merge branch 'master' into openelec-pvr
Conflicts:
	packages/mediacenter/xbmc-theme-Confluence/meta
	packages/mediacenter/xbmc/meta
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-001-add_support_to_specify_GIT_REV-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-013-reenable_lcd_config_settings-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-303-fix_libdvd_xFLAGS-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-311-fix_rsxs_build-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-351-increase_YV12_buffers-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-402-enable_yasm_in_ffmpeg-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-404-add_lame_check-0.6.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-454-disable_backslash-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-457-fix_connection_check-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-462-add_remote_irtrans_mediacenter-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-463-add_remote_devinput-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-0e174c0-464-add_eject_keymapping_for_lirc-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-001-add_support_to_specify_GIT_REV-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-013-reenable_lcd_config_settings-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-303-fix_libdvd_xFLAGS-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-311-fix_rsxs_build-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-351-increase_YV12_buffers-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-402-enable_yasm_in_ffmpeg-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-404-add_lame_check-0.6.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-454-disable_backslash-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-457-fix_connection_check-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-462-add_remote_irtrans_mediacenter-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-463-add_remote_devinput-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-2e00d86-464-add_eject_keymapping_for_lirc-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-51c5336-001-add_support_to_specify_GIT_REV-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-51c5336-013-reenable_lcd_config_settings-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-51c5336-303-fix_libdvd_xFLAGS-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-51c5336-311-fix_rsxs_build-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-51c5336-351-increase_YV12_buffers-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-51c5336-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-51c5336-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-51c5336-402-enable_yasm_in_ffmpeg-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-51c5336-404-add_lame_check-0.6.patch
	packages/mediacenter/xbmc/patches/xbmc-51c5336-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-51c5336-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-51c5336-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-51c5336-454-disable_backslash-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-51c5336-457-fix_connection_check-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-51c5336-462-add_remote_irtrans_mediacenter-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-51c5336-463-add_remote_devinput-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-51c5336-464-add_eject_keymapping_for_lirc-0.1.patch
2011-12-02 09:27:44 +01:00
..