mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 01:11:06 +02:00
4aa0dca60b3179be1b0c77a1c7cf3ee4db4dceba
Conflicts:
src/gui/followscreenings.cpp
Origin commit data
------------------
Branch: ni/coolstream
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
------------------
This commit was generated by Migit
Neutrino-HD ツ
Description
Languages
C++
85%
C
12.5%
Shell
0.6%
Makefile
0.6%
M4
0.5%
Other
0.7%