mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 00:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
ff7b7dfde75102e5d31a8f90b48e9518e447395c
recycled-ni-neutrino/lib/libtuxtxt
History
vanhofen ff7b7dfde7 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	lib/libdvbsub/dvbsub.cpp
	lib/libtuxtxt/tuxtxt.cpp
	src/driver/lcdd.cpp
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 40c7218952
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
2017-02-12 23:04:09 +01:00
..
libtuxtxt.cpp
Revert 'Adapt neutrino-mp for CST hardware part #2'
2016-01-26 05:50:38 +01:00
Makefile.am
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2016-10-25 12:30:10 +02:00
teletext.h
Revert 'Adapt neutrino-mp for CST hardware part #2'
2016-01-26 05:50:38 +01:00
tuxtxt2.conf
network menu (#264)
2010-03-15 20:49:03 +00:00
tuxtxt_common.h
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2017-02-12 23:04:09 +01:00
tuxtxt_def.h
Revert 'Adapt neutrino-mp for CST hardware part #2'
2016-01-26 05:50:38 +01:00
tuxtxt.cpp
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
2017-02-12 23:04:09 +01:00
tuxtxt.h
NI \o/
2016-05-19 22:59:54 +02:00