Skip to content
Commits on Dec 9, 2011
  1. Merge branch 'upstream-ro/master'

    committed
    Conflicts:
      XBMC-ATV2.xcodeproj/project.pbxproj
      XBMC-IOS.xcodeproj/project.pbxproj
      XBMC.xcodeproj/project.pbxproj
      xbmc/addons/Addon.h
      xbmc/cores/dvdplayer/DVDPlayer.cpp
Commits on Nov 21, 2011
  1. @Memphiz
Commits on Nov 15, 2011
  1. Merge remote branch 'upstream-ro/master'

    committed
    Conflicts:
    	addons/skin.confluence/language/German/strings.xml
Commits on Nov 14, 2011
Commits on Nov 4, 2011
Commits on Aug 14, 2011
Commits on Aug 12, 2011
  1. Merge pull request #324 from cptspiff/rollbacks

    Arne Morten Kvarving committed
    Add-on rollbacks
Commits on Aug 11, 2011
  1. Merge remote branch 'upstream-ro/master'

    committed
    Conflicts:
    	Makefile.in
    	xbmc/FileItem.cpp
    	xbmc/GUIInfoManager.cpp
    	xbmc/cores/dvdplayer/DVDPlayer.cpp
    	xbmc/windows/GUIMediaWindow.cpp
Commits on Aug 9, 2011
Commits on Aug 8, 2011
  1. @Memphiz

    [add/change] - new addon platform "ios" - this will "break" addons wh…

    Memphiz committed
    …ich support "osx" and mean to support "osx" and "ios". Davilla said we track them down when the whining starts ... maybe earlier ;)
Commits on Aug 4, 2011
  1. Revert "Use system tinyxml library by default except on OSX and Windo…

    Andres Mejia committed
    …ws."
    
    This reverts commit d8f3f66.
  2. Use system tinyxml library by default except on OSX and Windows.

    Andres Mejia committed
    Small wrapper class is used to override LoadFile() and SaveFile() with code to
    use XBMC's VFS.
Commits on May 28, 2011
  1. Merge remote branch 'upstream-ro/master'

    committed
    Conflicts:
    	addons/skin.confluence/720p/custom_SkinSetting_1111.xml
    	addons/skin.confluence/language/English/strings.xml
    	xbmc/settings/AdvancedSettings.cpp
Commits on May 19, 2011
  1. @blinkseb
Commits on May 2, 2011
  1. Merge remote branch 'upstream-ro/master'

    committed
    Fixed conflicts:
    	xbmc/addons/Skin.cpp
Commits on May 1, 2011
Commits on Apr 25, 2011
  1. Merge remote branch 'upstream-ro/master'

    committed
    Fixed conflicts:
    	xbmc/Application.h
Commits on Apr 23, 2011
  1. @elupus

    fixed: don't export addon interface from main xbmc binary

    elupus committed
    Also fixed cplusplus guards for extern "C" clause in addon headers
Commits on Apr 20, 2011
Commits on Mar 27, 2011
  1. Merge remote branch 'upstream-ro/master'

    committed
    Fixed conflicts:
    	.gitignore
    	Makefile.in
    	project/VS2010Express/XBMC.vcxproj.filters
    	xbmc/GUIInfoManager.h
    	xbmc/cores/dvdplayer/DVDPlayer.cpp
Commits on Mar 25, 2011
  1. @amet
Commits on Mar 16, 2011
  1. Merge remote branch 'upstream-ro/master'

    committed
    Fixed conflicts:
    	Makefile.in
    	XBMC.xcodeproj/project.pbxproj
    	language/Finnish/strings.xml
    	project/VS2010Express/guilib.vcxproj
    	project/VS2010Express/guilib.vcxproj.filters
    	xbmc/addons/AddonDatabase.cpp
    	xbmc/addons/AddonDatabase.h
    	xbmc/input/ButtonTranslator.cpp
    	xbmc/settings/GUIWindowSettingsCategory.cpp
  2. moves UpdateRepos to the AddonInstaller class

    Jonathan Marshall committed
  3. ensure m_cpluff is initialized to NULL

    Jonathan Marshall committed
Commits on Mar 15, 2011
  1. @amet

    cleanup of #ifdef _XBOX

    amet committed
Commits on Mar 10, 2011
Commits on Mar 9, 2011
  1. build dependency list on construction of addons so it's always availa…

    Jonathan Marshall committed
    …ble, rather than re-querying through the addon manager
Commits on Feb 8, 2011
Commits on Jan 26, 2011
  1. Merge code-reshuffle

    committed
Commits on Jan 25, 2011
  1. added: function to parse an addon descriptor from memory

    Jonathan Marshall committed
Commits on Jan 24, 2011
  1. Merged cptspiff's code-reshuffle branch.

    theuni committed
    Squashed commit due to build breakage during code-reshuffle history.
    
    Conflicts:
    	xbmc/Util.cpp
    	xbmc/cdrip/CDDARipper.cpp
    	xbmc/filesystem/Directory.cpp
    	xbmc/filesystem/File.cpp
Commits on Jan 23, 2011
  1. Fix my git's f*ckup in upstream/master.

    committed
    This reverts commit bfb0ba2.
  2. Revert "Merge remote branch 'upstream/master'"

    committed
    This reverts commit 4e98a51, reversing
    changes made to 8d73cbd.
Commits on Jan 15, 2011
Commits on Jan 13, 2011
Something went wrong with that request. Please try again.