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-31 09:21:09 +02:00

Go to file

vanhofen b9f4f1b894 streaminfo: fix merge error

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

Origin message was:
------------------
- streaminfo: fix merge error

------------------
No further description and justification available within origin commit message!

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

2017-11-06 00:26:34 +01:00

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

2017-11-03 13:05:34 +01:00

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

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

tuxtxt: change some default values

2017-11-03 23:20:34 +01:00

streaminfo: fix merge error

2017-11-06 00:26:34 +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-03 17:46:01 +01:00

AUTHORS

our current experimental Neutrino branch

2009-12-08 11:05:11 +00:00

autogen.sh

autogen.sh: align package name

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

autorun.sh

autorun.sh: change PATH and LD_LIBRARY_PATH

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

ChangeLog

re-add dummy ChangeLog to satisfy automake

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

configure.ac

configure.ac: align package name

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

COPYING

Automake was automatically including a standard COPYING file from the automake tree. As neutrino is still GPLv2 (in our opinion) we should let this file represent that status of the license. All our changes in the source code were made in accordance with this license.

2011-11-01 11:07:36 +00:00

Makefile.am

add top-level "locale-update" convenience target

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

NEWS

our current experimental Neutrino branch

2009-12-08 11:05:11 +00:00

README

missing file

2009-12-08 11:18:17 +00:00

README.md

Create README.md

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

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%