Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c35e647878
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-07 (Thu, 07 Dec 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-12-07 12:17:23 +01:00
4 changed files with 12 additions and 7 deletions

View File

@@ -1,4 +1,4 @@
installdir = $(datadir)/iso-codes
installdir = $(DATADIR)/iso-codes
install_DATA = \
iso-639.tab