xb

xbmc@htpc:~/Builds/xbmc$ sudo git pull
remote: Counting objects: 5548, done.
remote: Compressing objects: 100% (1359/1359), done.
remote: Total 4078 (delta 2804), reused 3685 (delta 2575)
Receiving objects: 100% (4078/4078), 3.61 MiB | 547 KiB/s, done.
Resolving deltas: 100% (2804/2804), completed with 757 local objects.
From git://github.com/FernetMenta/xbmc
 + 69d5ca2...a6bf0be master     -> origin/master  (forced update)
 * [new branch]      resfix     -> origin/resfix
Auto-merging xbmc/windowing/X11/WinSystemX11.cpp
CONFLICT (content): Merge conflict in xbmc/windowing/X11/WinSystemX11.cpp
Auto-merging xbmc/windowing/WinSystem.h
Auto-merging xbmc/video/windows/GUIWindowFullScreen.cpp
Auto-merging xbmc/video/dialogs/GUIDialogVideoSettings.cpp
Auto-merging xbmc/video/GUIViewStateVideo.cpp
Auto-merging xbmc/utils/XMLUtils.cpp
Auto-merging xbmc/utils/TextSearch.cpp
CONFLICT (add/add): Merge conflict in xbmc/utils/TextSearch.cpp
Auto-merging xbmc/utils/Observer.cpp
CONFLICT (add/add): Merge conflict in xbmc/utils/Observer.cpp
Auto-merging xbmc/test/xbmc-test.cpp
Auto-merging xbmc/test/TestBasicEnvironment.h
Auto-merging xbmc/system.h
CONFLICT (content): Merge conflict in xbmc/system.h
Auto-merging xbmc/settings/GUIWindowSettingsCategory.cpp
Auto-merging xbmc/settings/GUISettings.cpp
Auto-merging xbmc/settings/GUIDialogSettings.cpp
Auto-merging xbmc/settings/AdvancedSettings.h
Auto-merging xbmc/settings/AdvancedSettings.cpp
Auto-merging xbmc/pvr/windows/GUIWindowPVRGuide.cpp
CONFLICT (add/add): Merge conflict in xbmc/pvr/windows/GUIWindowPVRGuide.cpp
Auto-merging xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp
CONFLICT (add/add): Merge conflict in xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp
Auto-merging xbmc/pvr/addons/PVRClients.cpp
CONFLICT (add/add): Merge conflict in xbmc/pvr/addons/PVRClients.cpp
Auto-merging xbmc/interfaces/Builtins.cpp
Auto-merging xbmc/guilib/GUIFontTTFGL.cpp
Auto-merging xbmc/filesystem/VTPFile.cpp
Auto-merging xbmc/filesystem/MythFile.cpp
Auto-merging xbmc/filesystem/Makefile.in
Auto-merging xbmc/epg/GUIEPGGridContainer.cpp
CONFLICT (add/add): Merge conflict in xbmc/epg/GUIEPGGridContainer.cpp
Auto-merging xbmc/epg/Epg.cpp
CONFLICT (add/add): Merge conflict in xbmc/epg/Epg.cpp
Auto-merging xbmc/cores/dvdplayer/Edl.cpp
Auto-merging xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
Auto-merging xbmc/cores/dvdplayer/DVDPlayer.cpp
Auto-merging xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.h
Auto-merging xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp
Auto-merging xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.h
CONFLICT (add/add): Merge conflict in xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.h
Auto-merging xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp
CONFLICT (add/add): Merge conflict in xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp
Auto-merging xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
CONFLICT (content): Merge conflict in xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
Auto-merging xbmc/cores/VideoRenderers/WinRenderer.h
Auto-merging xbmc/cores/VideoRenderers/WinRenderer.cpp
Auto-merging xbmc/cores/VideoRenderers/LinuxRendererGLES.h
Auto-merging xbmc/cores/VideoRenderers/LinuxRendererGL.h
Auto-merging xbmc/cores/VideoRenderers/BaseRenderer.h
Auto-merging xbmc/addons/AddonCallbacksGUI.cpp
CONFLICT (add/add): Merge conflict in xbmc/addons/AddonCallbacksGUI.cpp
Auto-merging xbmc/Util.cpp
Auto-merging xbmc/GUIInfoManager.h
Auto-merging xbmc/Application.cpp
CONFLICT (content): Merge conflict in xbmc/Application.cpp
Auto-merging system/playercorefactory.xml
Auto-merging project/VS2010Express/XBMC.vcxproj.filters
CONFLICT (content): Merge conflict in project/VS2010Express/XBMC.vcxproj.filters
Auto-merging project/VS2010Express/XBMC.vcxproj
CONFLICT (content): Merge conflict in project/VS2010Express/XBMC.vcxproj
Auto-merging project/VS2010Express/XBMC for Windows.sln
CONFLICT (content): Merge conflict in project/VS2010Express/XBMC for Windows.sln
Removing lib/libUPnP/Platinum/Targets/neptune-logging.properties
Removing lib/libUPnP/Platinum/Source/Platinum/PltSvnVersion.h
Auto-merging lib/libUPnP/Platinum/Source/Extras/PltStreamPump.h
Auto-merging lib/libUPnP/Platinum/Source/Extras/PltStreamPump.cpp
Auto-merging lib/libUPnP/Platinum/Source/Extras/PltRingBufferStream.h
Auto-merging lib/libUPnP/Platinum/Source/Extras/PltRingBufferStream.cpp
Auto-merging lib/libUPnP/Platinum/Source/Extras/PltMetadataHandler.h
Auto-merging lib/libUPnP/Platinum/Source/Extras/PltMetadataHandler.cpp
Auto-merging lib/libUPnP/Platinum/Source/Extras/PltLeaks.h
Auto-merging lib/libUPnP/Platinum/Source/Extras/PltLeaks.cpp
Auto-merging lib/libUPnP/Platinum/Source/Extras/PltFrameStream.h
Auto-merging lib/libUPnP/Platinum/Source/Extras/PltFrameStream.cpp
Auto-merging lib/libUPnP/Platinum/Source/Extras/PltFrameServer.h
Auto-merging lib/libUPnP/Platinum/Source/Extras/PltFrameServer.cpp
Auto-merging lib/libUPnP/Platinum/Source/Extras/PltFrameBuffer.h
Auto-merging lib/libUPnP/Platinum/Source/Extras/PltFrameBuffer.cpp
Auto-merging lib/libUPnP/Platinum/Source/Extras/PltDownloader.h
Auto-merging lib/libUPnP/Platinum/Source/Extras/PltDownloader.cpp
Auto-merging lib/libUPnP/Platinum/Source/Extras/Managed/Service.h
Auto-merging lib/libUPnP/Platinum/Source/Extras/Managed/MediaConnect.h
Auto-merging lib/libUPnP/Platinum/Source/Extras/Managed/Didl.h
Removing lib/libUPnP/Platinum/Source/Core/PltXmlHelper.h
Removing lib/libUPnP/Platinum/Source/Core/PltUPnPHelper.h
Removing lib/libUPnP/Platinum/Source/Core/PltTime.cpp
Auto-merging lib/libUPnP/Platinum/Source/Core/PltMimeType.h
Auto-merging lib/libUPnP/Platinum/Source/Apps/CocoaTouchBrowser/MediaBrowserWrapper.h
Auto-merging lib/libUPnP/Platinum/Build/Tools/Scripts/VsMake.py
Removing lib/libUPnP/Platinum/Build/Targets/x86-microsoft-xbox-vs2003/Platinum/Platinum.vcproj
Removing lib/libUPnP/Platinum/Build/Targets/x86-microsoft-xbox-vs2003/Platinum.sln
Removing lib/libUPnP/Platinum/Build/Targets/x86-microsoft-xbox-vs2003/MediaServer/PltMediaServer.vcproj
Removing lib/libUPnP/Platinum/Build/Targets/x86-microsoft-win32-vs2005/SsdpProxy/SsdpProxy.vcproj
Removing lib/libUPnP/Platinum/Build/Targets/x86-microsoft-win32-vs2005/Platinum/Platinum.vcproj
Removing lib/libUPnP/Platinum/Build/Targets/x86-microsoft-win32-vs2005/Platinum.sln
Removing lib/libUPnP/Platinum/Build/Targets/x86-microsoft-win32-vs2005/MicroMediaController/MicroMediaController.vcproj
Removing lib/libUPnP/Platinum/Build/Targets/x86-microsoft-win32-vs2005/MediaRendererTest/MediaRendererTest.vcproj
Removing lib/libUPnP/Platinum/Build/Targets/x86-microsoft-win32-vs2005/MediaCrawler/MediaCrawler.vcproj
Removing lib/libUPnP/Platinum/Build/Targets/x86-microsoft-win32-vs2005/MediaCrawler/MediaCrawler.sln
Removing lib/libUPnP/Platinum/Build/Targets/x86-microsoft-win32-vs2005/LightSampleTest/LightSampleTest.vcproj
Removing lib/libUPnP/Platinum/Build/Targets/x86-microsoft-win32-vs2005/HttpTest/HttpTest.vcproj
Removing lib/libUPnP/Platinum/Build/Targets/x86-microsoft-win32-vs2005/FileMediaServerTest/FileMediaServerTest.vcproj
Removing lib/libUPnP/Platinum/Build/Targets/universal-apple-macosx/PlatinumApps.xcodeproj/project.pbxproj
Removing lib/libUPnP/Platinum/Build/Targets/arm-apple-darwin/Config.scons
Auto-merging lib/libUPnP/Neptune/ThirdParty/axTLS/config/Generic/config.h
Removing lib/libUPnP/Neptune/Source/System/StdC/NptStdCTime.cpp
Removing lib/libUPnP/Neptune/Source/System/PSP/NptPSPThreads.cpp
Removing lib/libUPnP/Neptune/Source/System/PSP/NptPSPSystem.cpp
Removing lib/libUPnP/Neptune/Source/System/PSP/NptPSPQueue.cpp
Removing lib/libUPnP/Neptune/Source/System/PSP/NptPSPNetwork.cpp
Removing lib/libUPnP/Neptune/Source/System/PSP/NptPSPFile.cpp
Removing lib/libUPnP/Neptune/Source/System/PSP/NptPSPDirectory.cpp
Auto-merging lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2010/Neptune.sln
Auto-merging lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2008/axTLS/axTLS.vcproj
Auto-merging lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2008/TlsTest1/TlsTest1.vcproj
Removing lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2005/XmlTest1/XmlTest1.vcproj
Removing lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2005/UrlTest1/UrlTest1.vcproj
Removing lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2005/UdpTest1/UdpTest1.vcproj
Removing lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2005/ThreadsTest1/ThreadsTest1.vcproj
Removing lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2005/StringsTest1/StringsTest1.vcproj
Removing lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2005/RingBufferTest1/RingBufferTest1.vcproj
Removing lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2005/QueueTest1/QueueTest1.vcproj
Removing lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2005/NetPump/NetPump.vcproj
Removing lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2005/NetPing/NetPing.vcproj
Removing lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2005/NetEcho/NetEcho.vcproj
Removing lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2005/NetConfig/NetConfig.vcproj
Removing lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2005/Neptune/Neptune.vcproj
Removing lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2005/MiscTest1/MiscTest1.vcproj
Removing lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2005/MessagesTest1/MessagesTest1.vcproj
Removing lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2005/MapsTest1/MapsTest1.vcproj
Removing lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2005/LoggingTest2/LoggingTest2.vcproj
Removing lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2005/LoggingTest1/LoggingTest1.vcproj
Removing lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2005/ListsTest1/ListsTest1.vcproj
Removing lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2005/HttpServerTest1/HttpServerTest1.vcproj
Removing lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2005/HttpClientTest1/HttpClientTest1.vcproj
Removing lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2005/FileTest2/FileTest2.vcproj
Removing lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2005/FileTest1/FileTest1.vcproj
Removing lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2005/BufferedStreamsTest1/BufferedStreamsTest1.vcproj
Removing lib/libUPnP/Neptune/Build/Targets/x86-microsoft-win32-vs2005/ArraysTest1/ArraysTest1.vcproj
Removing lib/libUPnP/Neptune/Build/Targets/mipsel-psp-linux/CodeWarrior/PSP_Lib_C++.mcp.xml
Removing lib/libUPnP/Neptune/Build/Targets/mipsel-psp-linux/CodeWarrior/PREFIX_PSP_RELEASE.h
Removing lib/libUPnP/Neptune/Build/Targets/mipsel-psp-linux/CodeWarrior/PREFIX_PSP_DEBUG.h
Removing lib/libUPnP/Neptune/Build/Targets/mipsel-psp-linux/CodeWarrior/Neptune_Data/CWSettingsWindows.stg
Removing lib/libUPnP/Neptune/Build/Targets/mipsel-psp-linux/CodeWarrior/Neptune.mcp
Auto-merging lib/gtest/msvc/gtest_unittest-md.vcproj
Auto-merging language/English/strings.po
CONFLICT (content): Merge conflict in language/English/strings.po
Removing keymapping.txt
Auto-merging docs/README.pvr
CONFLICT (add/add): Merge conflict in docs/README.pvr
Auto-merging configure.in
CONFLICT (content): Merge conflict in configure.in
Auto-merging bootstrap
Auto-merging addons/library.xbmc.addon/dlfcn-win32.h
CONFLICT (add/add): Merge conflict in addons/library.xbmc.addon/dlfcn-win32.h
Auto-merging addons/library.xbmc.addon/dlfcn-win32.cpp
CONFLICT (add/add): Merge conflict in addons/library.xbmc.addon/dlfcn-win32.cpp
Auto-merging XBMC.xcodeproj/project.pbxproj
CONFLICT (content): Merge conflict in XBMC.xcodeproj/project.pbxproj
Auto-merging XBMC-IOS.xcodeproj/project.pbxproj
CONFLICT (content): Merge conflict in XBMC-IOS.xcodeproj/project.pbxproj
Auto-merging XBMC-ATV2.xcodeproj/project.pbxproj
CONFLICT (content): Merge conflict in XBMC-ATV2.xcodeproj/project.pbxproj
Auto-merging Makefile.in
CONFLICT (content): Merge conflict in Makefile.in
Auto-merging .gitignore
Automatic merge failed; fix conflicts and then commit the result.