fixed: probs after merge
authoralcoheca <alcoheca@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Tue, 16 Feb 2010 18:33:16 +0000 (18:33 +0000)
committeralcoheca <alcoheca@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Tue, 16 Feb 2010 18:33:16 +0000 (18:33 +0000)
commit808e21fcda8b304bf93fcf08b76f070247971b52
tree8c253c3df881247d40a284c73a87d88f04ba9621
parent6e161a0bc17c017e2cfc76415e5ef720fdd24359
fixed: probs after merge
revert: unneeded differences from trunk

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/addons-fwork@27901 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
xbmc/GUIWindowVideoBase.cpp
xbmc/addons/include/xbmc_scr_dll.h
xbmc/addons/include/xbmc_vis_dll.h
xbmc/lib/libhttpapi/XBMChttp.cpp