mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 09:21:09 +02:00
Merge branch 'check/next-cc'
again: it compiles, but is not really tested...
Conflicts:
acinclude.m4
src/driver/volume.cpp
src/gui/infoviewer.cpp
src/gui/osd_setup.cpp
src/gui/start_wizard.cpp
src/zapit/src/getservices.cpp
Origin commit data
------------------
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)
This commit is contained in:
@@ -243,6 +243,7 @@ data/Makefile
|
||||
data/fonts/Makefile
|
||||
data/icons/Makefile
|
||||
data/inetradio/Makefile
|
||||
data/initial/Makefile
|
||||
data/iso-codes/Makefile
|
||||
data/lcd/Makefile
|
||||
data/lcd/icons/Makefile
|
||||
|
Reference in New Issue
Block a user