mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 09:21:09 +02:00
Thilo Graf
ffa144101a
Conflicts:
src/gui/followscreenings.cpp
Origin commit data
------------------
Commit: 2e8c700dd2
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-15 (Tue, 15 Nov 2016)
Origin message was:
------------------
Merge branch 'master' into pu/msgbox
Conflicts:
src/gui/followscreenings.cpp
Neutrino-HD ツ