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-09-01 18:01:06 +02:00

Go to file

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

Conflicts:
	src/gui/movieplayer.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: dfac4d01dc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)



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

2017-03-06 22:43:51 +01:00

Merge remote-tracking branch 'tuxbox/master'

2017-03-04 19:32:30 +01:00

doc: remove outdated ir.html

2016-12-15 14:00:45 +01:00

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

2017-03-06 22:40:18 +01:00

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

2017-03-06 22:43:51 +01:00

.gitignore

Merge branch 'ni/mp' into ni/cst-next

2016-08-26 19:13:47 +02:00

.svnignore

…

acinclude.m4

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

2017-02-28 16:55:39 +01:00

AUTHORS

…

autogen.sh

autogen.sh: add 'autoreconf -fi' call

2017-02-22 13:41:43 +01:00

autorun.sh

…

ChangeLog

…

configure.ac

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

2017-03-06 22:40:18 +01:00

COPYING

…

cross-configure.apollo.debug

cross-configure.apollo.debug: enable ffmpegdec and lua

2014-01-23 12:26:43 +04:00

cross-configure.cool

…

cross-configure.cool.debug

…

cross-configure.tuxbox

…

Makefile.am

add top-level "locale-update" convenience target

2016-01-03 16:21:24 +01:00

NEWS

…

README

…

README.md

Create README.md

2016-02-16 10:16:15 +03:00

version_pseudo.h

remove screen_width/height from neutrino.conf; ...

2017-02-09 18:13:19 +01:00

README.md

Neutrino-HD ツ

Languages

C++ 85%

C 12.5%

Shell 0.6%

Makefile 0.6%

M4 0.5%

Other 0.7%