merge -r 22950:23000
authorbobo1on1 <bobo1on1@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sun, 20 Sep 2009 15:49:28 +0000 (15:49 +0000)
committerbobo1on1 <bobo1on1@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sun, 20 Sep 2009 15:49:28 +0000 (15:49 +0000)
commit6dc99c9cfc408c168982420376f668e3cf2d2f48
tree061f439127f876c70177f5e4eaa85620734e8ce8
parent96594a0eebcd54d728fce0589ea63b38036820b7
merge -r 22950:23000

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/prettylights@23024 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
218 files changed:
XBMC.xcodeproj/project.pbxproj
guilib/ActionManager.cpp
guilib/AnimatedGif.cpp
guilib/AudioContext.cpp
guilib/DirectXGraphics.cpp
guilib/DirectXGraphics.h
guilib/FrameBufferObject.cpp
guilib/FrameBufferObject.h
guilib/GUIActionDescriptor.h
guilib/GUIAudioManager.cpp
guilib/GUIAudioManager.h
guilib/GUIBaseContainer.cpp
guilib/GUIBorderedImage.cpp
guilib/GUIButtonControl.cpp
guilib/GUIButtonScroller.cpp
guilib/GUIButtonScroller.h
guilib/GUICheckMarkControl.cpp
guilib/GUIColorManager.cpp
guilib/GUIColorManager.h
guilib/GUIControl.cpp
guilib/GUIControl.h
guilib/GUIControlFactory.cpp
guilib/GUIControlGroup.cpp
guilib/GUIControlGroupList.cpp
guilib/GUIControlProfiler.cpp
guilib/GUIDialog.cpp
guilib/GUIDialog.h
guilib/GUIEditControl.cpp
guilib/GUIFadeLabelControl.cpp
guilib/GUIFixedListContainer.cpp
guilib/GUIFont.cpp
guilib/GUIFontManager.cpp
guilib/GUIFontTTF.cpp
guilib/GUIFontTTFGL.cpp
guilib/GUIFontTTFGLES.cpp
guilib/GUIImage.cpp
guilib/GUIIncludes.cpp
guilib/GUIIncludes.h
guilib/GUIInfoColor.cpp
guilib/GUIInfoColor.h
guilib/GUILabelControl.cpp
guilib/GUIListContainer.cpp
guilib/GUIListGroup.cpp
guilib/GUIListItem.cpp
guilib/GUIListItemLayout.cpp
guilib/GUIListLabel.cpp
guilib/GUIMessage.cpp
guilib/GUIMessage.h
guilib/GUIMoverControl.cpp
guilib/GUIMultiImage.cpp
guilib/GUIMultiSelectText.cpp
guilib/GUIPanelContainer.cpp
guilib/GUIProgressControl.cpp
guilib/GUIRSSControl.cpp
guilib/GUIRadioButtonControl.cpp
guilib/GUIResizeControl.cpp
guilib/GUIScrollBarControl.cpp
guilib/GUISelectButtonControl.cpp
guilib/GUISettingsSliderControl.cpp
guilib/GUISliderControl.cpp
guilib/GUISound.cpp
guilib/GUISound.h
guilib/GUISpinControl.cpp
guilib/GUISpinControlEx.cpp
guilib/GUIStandardWindow.cpp
guilib/GUITextBox.cpp
guilib/GUITextLayout.cpp
guilib/GUITextLayout.h
guilib/GUITexture.cpp
guilib/GUITextureD3D.cpp
guilib/GUITextureGL.cpp
guilib/GUITextureGLES.cpp
guilib/GUITextureSDL.cpp
guilib/GUIToggleButtonControl.cpp
guilib/GUIVideoControl.cpp
guilib/GUIVisualisationControl.cpp
guilib/GUIWindow.cpp
guilib/GUIWindowManager.cpp
guilib/GUIWindowManager.h
guilib/GUIWrappingListContainer.cpp
guilib/GraphicContext.cpp
guilib/IWindowManagerCallback.cpp
guilib/Key.cpp
guilib/Key.h
guilib/LocalizeStrings.cpp
guilib/Makefile
guilib/Shader.cpp
guilib/Shader.h
guilib/SkinInfo.cpp
guilib/Texture.cpp
guilib/Texture.h
guilib/TextureBundle.cpp
guilib/TextureBundle.h
guilib/TextureDX.cpp
guilib/TextureGL.cpp
guilib/TextureManager.cpp
guilib/TransformMatrix.h
guilib/VisibleEffect.cpp
guilib/VisibleEffect.h
guilib/XMLUtils.cpp
guilib/XMLUtils.h
guilib/common/SDLJoystick.cpp
guilib/common/SDLJoystick.h
guilib/freetype2/freetype221.lib [deleted file]
guilib/freetype2/freetype221_D.lib [deleted file]
guilib/freetype2/include/freetype/config/ftconfig.h
guilib/freetype2/include/freetype/config/ftheader.h
guilib/freetype2/include/freetype/config/ftoption.h
guilib/freetype2/include/freetype/config/ftstdlib.h
guilib/freetype2/include/freetype/freetype.h
guilib/freetype2/include/freetype/fterrdef.h
guilib/freetype2/include/freetype/fterrors.h
guilib/freetype2/include/freetype/ftglyph.h
guilib/freetype2/include/freetype/ftimage.h
guilib/freetype2/include/freetype/ftoutln.h
guilib/freetype2/include/freetype/ftsystem.h
guilib/freetype2/include/freetype/fttypes.h
guilib/gui3d.h
guilib/include.cpp [deleted file]
guilib/include.h [deleted file]
guilib/system.h
language/English/strings.xml
language/German/strings.xml
project/Win32BuildSetup/BuildSetup.bat
project/Win32BuildSetup/XBMC for Windows.nsi
skin/PM3.HD/language/German/strings.xml
system/keymaps/remote.xml
system/players/dvdplayer/libass.dll
system/scrapers/video/adultdvdempire.xml
visualisations/Waveform_win32dx.vis [new file with mode: 0644]
visualisations/xbmc_vis.h
xbmc/AdvancedSettings.cpp
xbmc/Application.cpp
xbmc/Application.h
xbmc/ApplicationMessenger.cpp
xbmc/ApplicationMessenger.h
xbmc/AutoSwitch.cpp
xbmc/ButtonTranslator.cpp
xbmc/ButtonTranslator.h
xbmc/FileSystem/CMythDirectory.cpp
xbmc/FileSystem/CMythFile.cpp
xbmc/FileSystem/CMythFile.h
xbmc/FileSystem/DllLibCMyth.h
xbmc/FileSystem/DllLibCurl.h
xbmc/FileSystem/FileCurl.cpp
xbmc/FileSystem/ILiveTV.h
xbmc/FileSystem/VTPFile.cpp
xbmc/FileSystem/VTPFile.h
xbmc/FileSystem/curl/curl.h
xbmc/FileSystem/curl/curlbuild.h
xbmc/GUIDialogContextMenu.cpp
xbmc/GUIMediaWindow.cpp
xbmc/GUIViewControl.cpp
xbmc/GUIViewState.cpp
xbmc/GUIViewStateMusic.cpp
xbmc/GUIViewStatePictures.cpp
xbmc/GUIViewStatePrograms.cpp
xbmc/GUIViewStateScripts.cpp
xbmc/GUIViewStateVideo.cpp
xbmc/GUIWindowFullScreen.cpp
xbmc/GUIWindowHome.cpp
xbmc/GUIWindowMusicNav.cpp
xbmc/GUIWindowMusicPlaylistEditor.cpp
xbmc/GUIWindowSettings.cpp
xbmc/GUIWindowStartup.cpp
xbmc/GUIWindowSystemInfo.cpp
xbmc/GUIWindowTestPattern.cpp
xbmc/GUIWindowVideoNav.cpp
xbmc/PowerManager.cpp
xbmc/RenderSystem.h
xbmc/RenderSystemDX.cpp
xbmc/RenderSystemDX.h
xbmc/SlideShowPicture.cpp
xbmc/URL.cpp
xbmc/URL.h
xbmc/Util.cpp
xbmc/VideoReferenceClock.cpp
xbmc/VideoReferenceClock.h
xbmc/cores/VideoRenderers/OverlayRenderer.cpp
xbmc/cores/VideoRenderers/OverlayRenderer.h
xbmc/cores/VideoRenderers/OverlayRendererGL.cpp
xbmc/cores/VideoRenderers/OverlayRendererGL.h
xbmc/cores/VideoRenderers/RenderManager.h
xbmc/cores/VideoRenderers/VideoShaders/VideoFilterShader.cpp
xbmc/cores/VideoRenderers/VideoShaders/YUV2RGBShader.cpp
xbmc/cores/VideoRenderers/WinRenderer.cpp
xbmc/cores/VideoRenderers/WinRenderer.h
xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlaySSA.h
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.h
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.cpp
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.h
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.h
xbmc/cores/dvdplayer/DVDMessage.h
xbmc/cores/dvdplayer/DVDPlayer.cpp
xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
xbmc/cores/dvdplayer/DVDPlayerVideo.h
xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp
xbmc/lib/libGoAhead/XBMChttp.cpp
xbmc/lib/libPython/xbmcmodule/action.cpp
xbmc/lib/libass/libass/ass_render.c
xbmc/lib/libcmyth/cmyth.h
xbmc/lib/libcmyth/cmyth_local.h
xbmc/lib/libcmyth/commbreak.c
xbmc/lib/libcmyth/connection.c
xbmc/lib/libcmyth/mythtv_mysql.c
xbmc/lib/libcmyth/socket.c
xbmc/osx/SDLMain.mm
xbmc/utils/EventClient.cpp
xbmc/utils/EventClient.h
xbmc/utils/EventPacket.cpp
xbmc/utils/EventPacket.h
xbmc/utils/GUIInfoManager.cpp
xbmc/utils/RegExp.cpp
xbmc/visualizations/WaveForm/Main.cpp
xbmc/visualizations/WaveForm/Waveform.sln
xbmc/visualizations/WaveForm/Waveform.vcproj