vanhofen
|
9d255f3f05
|
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
lib/libdvbsub/dvbsubtitle.cpp
src/neutrino.cpp
src/nhttpd/tuxboxapi/neutrinoyparser.cpp
Origin commit data
------------------
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)
|
2017-03-12 22:03:03 +01:00 |
|
Michael Liebmann
|
cd4922c0c2
|
hd2/libcoolstream/*.h: Update for new libcoolstream functions
- cs_get_lib_version()
- cs_compare_lib_versions()
- GetVideoSystem()
- GetVideoSystemFormatName()
- Add CS_CHIP_NEVIS definitions
Origin commit data
------------------
Commit: ab6ca5b606
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-10 (Fri, 10 Mar 2017)
|
2017-03-10 14:35:32 +01:00 |
|
vanhofen
|
3a863c91f0
|
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
lib/Makefile.am
src/Makefile.am
src/neutrino.cpp
Origin commit data
------------------
Commit: e2d5f6ebf1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
|
2017-03-06 22:40:18 +01:00 |
|
vanhofen
|
fdda0de766
|
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
src/Makefile.am
Origin commit data
------------------
Commit: c582725f40
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
|
2017-03-06 22:07:52 +01:00 |
|
vanhofen
|
97391211a4
|
move public libcoolstream-headers to hardware directory
Origin commit data
------------------
Commit: 2029a684e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
Origin message was:
------------------
- move public libcoolstream-headers to hardware directory
|
2017-03-06 21:49:32 +01:00 |
|