mirrors/recycled-ni-neutrino: Mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino - recycled-ni-neutrino - TGNet Git by Gitea

mirrors/recycled-ni-neutrino

mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 17:01:08 +02:00

Go to file

vanhofen dbdda1de51 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox

Conflicts:
	acinclude.m4
	lib/hardware/coolstream/hardware_caps.cpp
	src/Makefile.am
	src/driver/screenshot.cpp
	src/gui/epgplus.cpp
	src/gui/scan_setup.cpp
	src/neutrino.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: bb00f9f2e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)



------------------
This commit was generated by Migit

2017-08-25 14:29:45 +02:00

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-08-25 14:15:22 +02:00

move src/timerd/doku.html to doc/timerd.html

2017-03-19 23:50:52 +01:00

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-08-25 14:15:22 +02:00

Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox

2017-08-25 14:29:45 +02:00

.gitignore

Merge remote-tracking branch 'tuxbox/master'

2017-03-21 06:50:08 +01:00

acinclude.m4

Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

2017-03-31 17:47:29 +02:00

AUTHORS

…

autogen.sh

Revert "- autogen.sh: add 'autoreconf -fi' call"

2017-03-20 14:14:23 +01:00

autorun.sh

…

ChangeLog

…

configure.ac

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-06-10 11:43:50 +02:00

COPYING

…

cross-configure.apollo.debug

…

cross-configure.cool

…

cross-configure.cool.debug

…

cross-configure.tuxbox

…

Makefile.am

…

NEWS

…

README

…

README.md

…

version_pseudo.h

align fontsize.filebrowser_item to new default

2017-06-06 21:55:39 +02:00

README.md

Neutrino-HD ツ

Languages

C++ 85%

C 12.5%

Shell 0.6%

Makefile 0.6%

M4 0.5%

Other 0.7%