Merge branch 'master' into pu/mp

Conflicts:
	acinclude.m4
This commit is contained in:
svenhoefer
2017-03-22 12:16:01 +01:00
14 changed files with 197 additions and 307 deletions

View File

@@ -3,7 +3,6 @@ AM_INIT_AUTOMAKE([1.0.1 nostdinc])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
TUXBOX_APPS
TUXBOX_APPS_DVB
TUXBOX_APPS_DIRECTORY
TUXBOX_APPS_PKGCONFIG
TUXBOX_BOXTYPE