recycled-ni-neutrino

mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 15:02:50 +02:00

Go to file

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

Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c35e647878
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-07 (Thu, 07 Dec 2017)



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

2017-12-07 12:17:23 +01:00

data

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

2017-12-07 12:17:23 +01:00

doc

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

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

lib

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

2017-11-28 10:31:10 +01:00

src

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

2017-12-07 12:17:23 +01:00

.gitignore

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

2017-10-18 09:41:46 +02:00

acinclude.m4

acinclude: fix indentation

2017-11-16 19:43:25 +01:00

AUTHORS

…

autogen.sh

autogen.sh: align package name

2017-11-03 17:46:01 +01:00

autorun.sh

autorun.sh: align to neutrino's exit codes

2017-12-07 12:16:08 +01:00

ChangeLog

re-add dummy ChangeLog to satisfy automake

2017-11-03 14:34:55 +01:00

configure.ac

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

2017-11-17 15:23:30 +01:00

COPYING

…

Makefile.am

…

NEWS

…

README

…

README.md

…

upgrade_version.pl

maintain: add version update script

2017-10-17 20:02:02 +02:00

version_pseudo.h

drop easymenu

2017-09-13 13:35:23 +02:00

README.md

Neutrino-HD ツ

Languages

C++ 85%

C 12.5%

Shell 0.6%

Makefile 0.6%

M4 0.5%

Other 0.7%