mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-26 15:02:50 +02:00
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:
@@ -1,4 +1,4 @@
|
||||
installdir = $(datadir)/iso-codes
|
||||
installdir = $(DATADIR)/iso-codes
|
||||
|
||||
install_DATA = \
|
||||
iso-639.tab
|
||||
|
Reference in New Issue
Block a user