[SCM] kodi/master: Merge tag 'upstream/14.2+dfsg1'

[rbalint at users.alioth.debian.org]

Imported Upstream version 14.2+dfsg1
Imported Upstream version 14.2+dfsg1
Imported Upstream version 14.2+dfsg1
Imported Upstream version 14.0+dfsg1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 98ad535a1221003a840c13a4f600ff4a13ef5c97
X-Git-Newrev: 0c747e51ec8978b32fb924ce6760f6fb91c7548a

The following commit has been merged in the master branch:
commit 2146a94d899ed4f3e20ffb84a735f3e37982014b
Merge: a76b811474d52e77e186e5282b135e6bf6539ba5 ce4e53d58cfd2b7c6748059633247f973a45b0c0
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Sat Mar 28 11:55:12 2015 +0100

    Merge tag 'upstream/14.2+dfsg1'
    
    Upstream version 14.2+dfsg1
    
    Conflicts:
    	addons/repository.pvr-android.xbmc.org/addon.xml
    	addons/repository.pvr-android.xbmc.org/icon.png
    	addons/repository.pvr-ios.xbmc.org/addon.xml
    	addons/repository.pvr-ios.xbmc.org/icon.png
    	addons/repository.pvr-osx32.xbmc.org/addon.xml
    	addons/repository.pvr-osx32.xbmc.org/icon.png
    	addons/repository.pvr-osx64.xbmc.org/addon.xml
    	addons/repository.pvr-osx64.xbmc.org/icon.png
    	addons/repository.pvr-win32.xbmc.org/addon.xml
    	addons/repository.pvr-win32.xbmc.org/icon.png
    	addons/repository.xbmc.org/addon.xml
    	addons/screensaver.rsxs.euphoria/addon.xml
    	addons/screensaver.rsxs.plasma/addon.xml
    	addons/screensaver.rsxs.solarwinds/addon.xml
    	addons/screensaver.xbmc.builtin.black/addon.xml
    	addons/screensaver.xbmc.builtin.dim/addon.xml
    	addons/screensaver.xbmc.builtin.dim/resources/language/Malay/strings.po
    	addons/screensaver.xbmc.builtin.dim/resources/language/Tamil (India)/strings.po
    	addons/skin.confluence/addon.xml
    	addons/skin.confluence/changelog.txt
    	addons/skin.confluence/language/Indonesian/strings.po
    	addons/skin.confluence/language/Japanese/strings.po
    	addons/skin.confluence/language/Malay/strings.po
    	addons/skin.confluence/language/Slovenian/strings.po
    	addons/skin.confluence/language/Tajik/strings.po
    	addons/skin.confluence/language/Tamil (India)/strings.po
    	addons/skin.confluence/language/Tatar/strings.po
    	addons/skin.confluence/language/Thai/strings.po
    	addons/skin.confluence/language/Vietnamese (Viet Nam)/strings.po
    	addons/skin.confluence/language/Welsh/strings.po
    	addons/visualization.fishbmc/addon.xml
    	addons/visualization.fishbmc/changelog.txt
    	addons/visualization.projectm/resources/language/Malay/strings.po
    	addons/visualization.vortex/addon.xml
    	addons/webinterface.default/addon.xml
    	configure.in
    	language/Amharic/strings.po
    	language/Dutch/strings.po
    	language/English (Australia)/strings.po
    	language/French/strings.po
    	language/Galician/strings.po
    	language/Hebrew/strings.po
    	language/Indonesian/strings.po
    	language/Italian/strings.po
    	language/Japanese/strings.po
    	language/Latvian/strings.po
    	language/Malay/strings.po
    	language/Polish/strings.po
    	language/Serbian/strings.po
    	language/Slovenian/strings.po
    	language/Thai/strings.po
    	language/Welsh/strings.po
    	media/Splash.png
    	project/BuildDependencies/scripts/0_package.list
    	project/VS2010Express/XBMC.defaults.props
    	project/VS2010Express/XBMC.vcxproj
    	project/VS2010Express/XBMC.vcxproj.filters
    	project/VS2010Express/libPlatinum.vcxproj
    	tools/EventClients/Clients/OSXRemote/XBMCHelper.m
    	tools/EventClients/Clients/OSXRemote/XBMCHelper.xcodeproj/project.pbxproj
    	tools/darwin/Configurations/Common.xcconfig.in
    	tools/depends/target/ffmpeg/FFMPEG-VERSION
    	tools/depends/target/ffmpeg/autobuild.sh
    	tools/depends/target/sqlite3/Makefile
    	tools/depends/target/xbmc-pvr-addons/Makefile
    	tools/depends/target/xbmc/Makefile
    	tools/windows/CompileInfo.bat
    	tools/windows/packaging/media/installer/header.bmp
    	tools/windows/packaging/media/installer/welcome-left.bmp
    	version.txt
    	xbmc/Application.cpp
    	xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp
    	xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
    	xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp
    	xbmc/win32/WIN32Util.cpp
    	xbmc/win32/XBMC_PC.cpp
    	xbmc/win32/XBMC_PC.rc.in


-- 
kodi packaging