fixed: merge probs
authoralcoheca <alcoheca@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Mon, 1 Mar 2010 19:40:20 +0000 (19:40 +0000)
committeralcoheca <alcoheca@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Mon, 1 Mar 2010 19:40:20 +0000 (19:40 +0000)
commit11ee1376faf5157cdefbd017e6d5c61f8dd4a934
tree4b21ebf7e07489e8387ebad3b1708c7b883092e3
parent44ebf8d124051809f0ada057dc3d58d4fe90ff70
fixed: merge probs

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/addons-fwork@28268 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
xbmc/NfoFile.cpp
xbmc/VideoDatabase.cpp
xbmc/VideoInfoScanner.cpp
xbmc/VideoInfoScanner.h