merge with trunk. revision 13003.
authorvulkanr <vulkanr@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Wed, 14 May 2008 13:35:10 +0000 (13:35 +0000)
committervulkanr <vulkanr@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Wed, 14 May 2008 13:35:10 +0000 (13:35 +0000)
commit6d4e0a277e1cce162ac8b73370b0ccf6cc628f6d
tree03d77d62e1bf8ec82cecc98b6235580cb1a764e5
parentfeef4d2f74053d2de0d34b3677083007afaed200
merge with trunk. revision 13003.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/linuxport@13004 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
XBMC/xbmc/GUIDialogContentSettings.cpp
XBMC/xbmc/GUIDialogContentSettings.h
XBMC/xbmc/NfoFile.cpp
XBMC/xbmc/VideoDatabase.cpp
XBMC/xbmc/VideoInfoScanner.cpp
XBMC/xbmc/VideoInfoScanner.h
XBMC/xbmc/VideoInfoTag.cpp
XBMC/xbmc/utils/GUIInfoManager.cpp