aboutsummaryrefslogtreecommitdiff
path: root/lib/libXBMS
AgeCommit message (Collapse)Author
2011-01-24Merged cptspiff's code-reshuffle branch.theuni
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