mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-30 17:01:15 +02:00
...needs buildfixing... Conflicts: data/Makefile.am src/driver/volume.cpp src/gui/infoviewer.cpp src/gui/miscsettings_menu.cpp src/gui/movieplayer.cpp src/gui/scan.cpp src/gui/widget/buttons.cpp src/gui/widget/menue.cpp src/gui/widget/stringinput.cpp src/neutrino.cpp src/nhttpd/tuxboxapi/coolstream/controlapi.cpp src/system/setting_helpers.cpp src/zapit/src/capmt.cpp