merge with trunk. revision 10951.
authorvulkanr <vulkanr@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Mon, 10 Dec 2007 11:48:55 +0000 (11:48 +0000)
committervulkanr <vulkanr@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Mon, 10 Dec 2007 11:48:55 +0000 (11:48 +0000)
commit49270d80fa7f085ec5fbd269a1dbc5850ea36df4
tree70f37889d01eff43fe7faa1bc94f012c2007a3c3
parent5869271524ae8d07e9bb3933ad4d6bdf00a3e295
merge with trunk. revision 10951.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/linuxport/XBMC@10952 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
20 files changed:
guilib/GUIBaseContainer.cpp
guilib/GUIBorderedImage.cpp
guilib/GUIFadeLabelControl.cpp
guilib/GUIFadeLabelControl.h
guilib/GUIListItemLayout.cpp
guilib/GUIListItemLayout.h
guilib/GUIWindow.h
system/ImageLib.dll
system/players/mplayer/codecs.conf
system/players/paplayer/libFLAC-i486-linux.so
system/players/paplayer/libFLAC.dll
system/scrapers/video/mtv.xml
userdata/PartyMode-Video.xsp [deleted file]
userdata/PartyMode.xsp [deleted file]
xbmc/FileSystem/ShoutcastDirectory.cpp
xbmc/GUIDialogSmartPlaylistEditor.cpp
xbmc/GUIWindowBuddies.cpp
xbmc/VideoDatabase.cpp
xbmc/cores/paplayer/flac/export.h
xbmc/cores/paplayer/flac/format.h