Gujs a1b3acc277 Merge branch 'master' into openelec-pvr ...

Conflicts:
	packages/mediacenter/xbmc-theme-Confluence/meta
	packages/mediacenter/xbmc/meta
	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-3943772-001-add_support_to_specify_GIT_REV-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-013-reenable_lcd_config_settings-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-303-fix_libdvd_xFLAGS-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-311-fix_rsxs_build-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-351-increase_YV12_buffers-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-402-enable_yasm_in_ffmpeg-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-404-add_lame_check-0.6.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-454-disable_backslash-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-457-fix_connection_check-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-462-add_remote_irtrans_mediacenter-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-463-add_remote_devinput-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-3943772-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-06 16:28:14 +01:00

..

mkpkg

Merge branch 'master' into openelec-pvr

2011-12-06 16:28:14 +01:00