Merge remote branch 'origin/trunk' into trac-8658
authorceros7 <ceros7@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sun, 29 Aug 2010 03:46:23 +0000 (03:46 +0000)
committerceros7 <ceros7@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sun, 29 Aug 2010 03:46:23 +0000 (03:46 +0000)
commit5436994e6d1befe86df21fcbb332274ebf31e9b0
treefd50bb705e9416e9adeadd739baf895a289ab5db
parent1ea0416ffa308695479a2e294b34bfa58f4d8ecf
Merge remote branch 'origin/trunk' into trac-8658

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/trac-8658@33289 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
68 files changed:
.gitignore
XBMC.xcodeproj/project.pbxproj
addons/metadata.themoviedb.org/resources/language/Romanian/strings.xml [new file with mode: 0644]
addons/skin.confluence/720p/DialogVideoInfo.xml
addons/skin.confluence/language/Romanian/strings.xml [new file with mode: 0644]
addons/visualization.dxspectrum/resources/language/Romanian/strings.xml [new file with mode: 0644]
addons/visualization.milkdrop/resources/language/Romanian/strings.xml [new file with mode: 0644]
guilib/GUILabelControl.cpp
guilib/GUISettingsSliderControl.cpp
guilib/GUISpinControlEx.cpp
language/Romanian/langinfo.xml
language/Romanian/strings.xml
media/Fonts/arial.ttf
project/VS2008Express/XBMC.vcproj
project/VS2010Express/XBMC.vcxproj.filters
system/players/dvdplayer/avcodec-52.dll
system/players/dvdplayer/avformat-52.dll
system/players/dvdplayer/avutil-50.dll
system/players/dvdplayer/postproc-51.dll
system/players/dvdplayer/swscale-0.6.1.dll
system/scrapers/video/AdultFilmdatabase.gif [deleted file]
system/scrapers/video/Excalibur.jpg [deleted file]
system/scrapers/video/Excalibur.xml [deleted file]
system/scrapers/video/adultcdmovies.jpg [deleted file]
system/scrapers/video/adultcdmovies.xml [deleted file]
system/scrapers/video/adultdvdempire.jpg [deleted file]
system/scrapers/video/adultdvdempire.xml [deleted file]
system/scrapers/video/adultfilmdatabase.xml [deleted file]
system/scrapers/video/jaded.jpg [deleted file]
system/scrapers/video/jadedVideo.xml [deleted file]
system/scrapers/video/tlaraw.png [deleted file]
system/scrapers/video/tlaraw.xml [deleted file]
tools/Linux/packaging/debian/control
tools/Linux/packaging/debian/var_info
tools/Linux/packaging/ppa-builder.sh
xbmc/Application.cpp
xbmc/DetectDVDType.cpp
xbmc/FileItem.cpp
xbmc/FileSystem/RSSDirectory.cpp
xbmc/FileSystem/VirtualDirectory.cpp
xbmc/GUIDialogAddonSettings.cpp
xbmc/GUIDialogSelect.cpp
xbmc/GUIWindowAddonBrowser.cpp
xbmc/GUIWindowSettingsCategory.cpp
xbmc/GUIWindowVideoBase.cpp
xbmc/MediaManager.cpp
xbmc/MediaManager.h
xbmc/SortFileItem.cpp
xbmc/SortFileItem.h
xbmc/VideoDatabase.cpp
xbmc/WinEventsWin32.cpp
xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.cpp
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.h
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
xbmc/cores/dvdplayer/DVDPlayer.cpp
xbmc/lib/libPython/xbmcmodule/listitem.cpp
xbmc/lib/libPython/xbmcmodule/winxml.cpp
xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp
xbmc/lib/libjsonrpc/FileItemHandler.cpp
xbmc/lib/sqLite/sqlitedataset.cpp
xbmc/linux/ConsoleUPowerSyscall.cpp
xbmc/linux/DeviceKitDisksProvider.cpp
xbmc/linux/DeviceKitDisksProvider.h
xbmc/linux/UDisksProvider.cpp
xbmc/linux/UDisksProvider.h
xbmc/utils/CharsetConverter.cpp
xbmc/utils/GUIInfoManager.cpp