recycled-ni-neutrino

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

Go to file

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

Conflicts:
	src/gui/audioplayer.cpp
	src/gui/audioplayer.h


Origin commit data
------------------
Commit: 5433054b38
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)

2017-06-18 00:52:04 +02:00

data

audioplayer: small design reworks ...

2017-06-18 00:04:40 +02:00

doc

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

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

lib

Revert "HD1: Workaround for missing cs_get_chip_type"

2017-06-16 19:33:29 +02:00

src

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

2017-06-18 00:52:04 +02:00

.gitignore

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

2017-03-15 22:47:35 +01:00

acinclude.m4

acinclude.m4: fix merge error

2017-03-23 19:00:57 +01:00

AUTHORS

…

autogen.sh

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

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

autorun.sh

autorun.sh: change PATH and LD_LIBRARY_PATH

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

ChangeLog

…

configure.ac

configure.ac: fix merge error

2017-06-07 15:28:53 +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

…

NEWS

…

README

…

README.md

Create README.md

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

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%