mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-26 23:13:13 +02:00
*needs buildfixing* Conflicts: src/daemonc/Makefile.am src/daemonc/remotecontrol.cpp src/driver/Makefile.am src/driver/audiodec/Makefile.am src/driver/pictureviewer/Makefile.am src/driver/vfd.cpp src/gui/bedit/Makefile.am src/gui/components/Makefile.am src/gui/luainstance.cpp src/gui/widget/Makefile.am src/nhttpd/tuxboxapi/coolstream/Makefile.am src/system/Makefile.am