recycled-ni-neutrino

mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 08:21:07 +02:00

Go to file

vanhofen 28376259c1 Merge branch 'master' into pu/mp

Conflicts:
	src/gui/epgplus.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 064f693bf7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)



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

2017-04-08 14:36:12 +02:00

data

Merge branch 'master' into pu/mp

2017-04-08 14:36:12 +02:00

doc

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

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

lib

Merge branch 'master' into pu/mp

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

src

Merge branch 'master' into pu/mp

2017-04-08 14:36:12 +02:00

.gitignore

Merge branch 'master' into pu/mp

2017-03-14 08:06:05 +01:00

acinclude.m4

acinclude.m4: fix merge error

2017-03-22 15:32:58 +01:00

AUTHORS

…

autogen.sh

autogen.sh: simplify

2016-01-14 22:29:00 +01:00

autorun.sh

autorun.sh: change PATH and LD_LIBRARY_PATH

2013-08-13 20:13:04 +04:00

ChangeLog

…

configure.ac

Merge branch 'master' into pu/mp

2017-03-31 17:41:29 +02: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

Revert "configure scripts: add boxmodel"

2013-01-31 16:59:50 +04:00

cross-configure.cool.debug

Revert "configure scripts: add boxmodel"

2013-01-31 16:59:50 +04:00

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%