merge with trunk
authorbobo1on1 <bobo1on1@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Tue, 15 Jun 2010 01:17:26 +0000 (01:17 +0000)
committerbobo1on1 <bobo1on1@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Tue, 15 Jun 2010 01:17:26 +0000 (01:17 +0000)
commit1261c90508e7adff05f921fba4fedd1383428cb7
tree66f860fae41cbb6cac3f6f9cf86d4dde9383adcf
parent738a03aceaee77595484c19429d36b5a0467f063
merge with trunk

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/boblight@31107 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
addons/metadata.tvdb.com/addon.xml
addons/metadata.tvdb.com/tvdb.xml
addons/skin.confluence/720p/DialogFullScreenInfo.xml
addons/skin.confluence/720p/IncludesCodecFlagging.xml
addons/skin.confluence/media/Makefile
addons/skin.confluence/media/flagging/video/vhs.png [new file with mode: 0644]
xbmc/addons/Scraper.cpp
xbmc/addons/Scraper.h
xbmc/utils/ScraperParser.cpp
xbmc/utils/ScraperParser.h