mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-26 23:13:13 +02:00
Conflicts: src/driver/rcinput.cpp src/gui/info_menue.cpp src/gui/mediaplayer.cpp src/gui/movieplayer.cpp src/zapit/src/frontend.cpp Signed-off-by: Thilo Graf <dbt@novatux.de>