[SCM] kodi-pvr-mythtv/master: Merge tag 'upstream/4.12.7+git20161219'

[rbalint at users.alioth.debian.org]

Imported Upstream version 4.12.7+git20161219
Imported Upstream version 4.7.2+git20160820
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4e0859796f9a770346716c97292f6c28cf4cbad1
X-Git-Newrev: 6575dddb9c16e6f699015138e33856c2eaf54ffa

The following commit has been merged in the master branch:
commit 57ff625785d036dabf5a8cf33e541c30218824a8
Merge: 4e0859796f9a770346716c97292f6c28cf4cbad1 090aafc3d88033588423d5bc68a6a3ebccc2756b
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Sat Dec 24 03:35:37 2016 +0100

    Merge tag 'upstream/4.12.7+git20161219'
    
    Upstream version 4.12.7+git20161219
    
    Conflicts:
    	.travis.yml
    	debian/control
    	lib/cppmyth/CMakeLists.txt
    	lib/cppmyth/src/private/mythwscontent.h
    	lib/cppmyth/src/private/mythwsrequest.cpp
    	lib/cppmyth/src/private/mythwsrequest.h
    	lib/cppmyth/src/private/mythwsresponse.cpp
    	lib/cppmyth/src/private/mythwsresponse.h
    	lib/cppmyth/src/private/wscontent.cpp
    	pvr.mythtv/addon.xml.in
    	pvr.mythtv/changelog.txt
    	pvr.mythtv/resources/language/resource.language.af_za/strings.po
    	pvr.mythtv/resources/language/resource.language.ca_es/strings.po
    	pvr.mythtv/resources/language/resource.language.cs_cz/strings.po
    	pvr.mythtv/resources/language/resource.language.da_dk/strings.po
    	pvr.mythtv/resources/language/resource.language.de_de/strings.po
    	pvr.mythtv/resources/language/resource.language.en_au/strings.po
    	pvr.mythtv/resources/language/resource.language.en_us/strings.po
    	pvr.mythtv/resources/language/resource.language.es_es/strings.po
    	pvr.mythtv/resources/language/resource.language.fi_fi/strings.po
    	pvr.mythtv/resources/language/resource.language.he_il/strings.po
    	pvr.mythtv/resources/language/resource.language.hr_hr/strings.po
    	pvr.mythtv/resources/language/resource.language.hu_hu/strings.po
    	pvr.mythtv/resources/language/resource.language.ko_kr/strings.po
    	pvr.mythtv/resources/language/resource.language.nb_no/strings.po
    	pvr.mythtv/resources/language/resource.language.pt_pt/strings.po
    	pvr.mythtv/resources/language/resource.language.ro_ro/strings.po
    	pvr.mythtv/resources/language/resource.language.ru_ru/strings.po
    	pvr.mythtv/resources/language/resource.language.sk_sk/strings.po
    	pvr.mythtv/resources/language/resource.language.sr_rs/strings.po
    	pvr.mythtv/resources/language/resource.language.sr_rs at latin/strings.po
    	pvr.mythtv/resources/language/resource.language.sv_se/strings.po
    	pvr.mythtv/resources/language/resource.language.tr_tr/strings.po
    	pvr.mythtv/resources/language/resource.language.zh_cn/strings.po
    	src/demux.cpp
    	src/pvrclient-mythtv.cpp


-- 
kodi-pvr-mythtv packaging