mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,512 Commits 2 Branches 9 Tags
8474ef8c98d45b835a84c9a92ad487e9e62010cc
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
vanhofen 8474ef8c98 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/slovak.locale
	lib/libcoolstream/hardware_caps.cpp
	lib/libcoolstream/hardware_caps.h
	lib/libdvbsub/dvbsubtitle.cpp
	lib/timerdclient/timerdclient.cpp
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/framebuffer_ng.h
	src/driver/pictureviewer/Makefile.am
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgplus.cpp
	src/gui/epgview.cpp
	src/gui/plugins.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/gui/widget/listbox.cpp
	src/gui/widget/listhelpers.cpp
	src/neutrino.cpp
	src/system/helpers.cpp
	src/system/helpers.h
	src/system/settings.cpp
	src/system/settings.h
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 75cce3b113
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
2016-10-25 13:08:01 +02:00
data
Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
2016-10-25 13:08:01 +02:00
doc
our current experimental Neutrino branch
2009-12-08 11:05:11 +00:00
lib
Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
2016-10-25 13:08:01 +02:00
src
Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
2016-10-25 13:08:01 +02:00
.gitignore
Merge branch 'ni/mp' into ni/cst-next
2016-08-26 19:13:47 +02:00
.svnignore
our current experimental Neutrino branch
2009-12-08 11:05:11 +00:00
acinclude.m4
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2016-10-23 21:57:00 +02:00
AUTHORS
our current experimental Neutrino branch
2009-12-08 11:05:11 +00:00
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
our current experimental Neutrino branch
2009-12-08 11:05:11 +00:00
configure.ac
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-10-25 12:30:10 +02: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
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
our current experimental Neutrino branch
2009-12-08 11:05:11 +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
version_pseudo.h
neutrino: force tmdb_api_key if previos entry is default
2016-08-04 12:18:23 +02:00

README.md

Neutrino-HD ツ

Description
Mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino
Readme 49 MiB
Languages
C++ 85%
C 12.5%
Shell 0.6%
Makefile 0.6%
M4 0.5%
Other 0.7%