fixed: bad merge in updatedatabase
authormalard <malard@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Thu, 2 Sep 2010 20:30:45 +0000 (20:30 +0000)
committermalard <malard@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Thu, 2 Sep 2010 20:30:45 +0000 (20:30 +0000)
commitdb48b4dbd161d62d7d67a384350929f2ce0fd475
treed014f99df88f5093acd0a1530c3fdff66065bb7c
parent73db6de5ee490b398e2d67e436783d44eb490063
fixed: bad merge in updatedatabase

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/webinterface@33446 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
xbmc/VideoDatabase.cpp
xbmc/VideoDatabase.h