mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 09:21:09 +02:00
8acef4abf40a45802668cd7db072bbb2af9f85db
Conflicts:
src/Makefile.am
src/driver/scanepg.cpp
src/gui/audioplayer.cpp
src/gui/infoviewer.cpp
src/gui/movieplayer.cpp
src/neutrino.cpp
src/neutrino.h
src/nhttpd/tuxboxapi/controlapi.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 265771c9a2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-23 (Thu, 23 Nov 2017)
------------------
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%