mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-31 09:21:18 +02:00
Merge branch 'master' into pu/mp
Conflicts: acinclude.m4
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user