vanhofen 2a41e4bfef Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next ...

Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: 3ec246f0a9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-03 (Wed, 03 Aug 2016)

2016-08-03 12:24:40 +02:00

..

daemonc

Revert "supplement to 1da21f8936b9b59f963525c117b6ae7b9cbf4bb5"

2016-04-05 17:38:25 +02:00

driver

add support for H265

2016-07-31 21:28:53 +02:00

eitd

NI \o/

2016-05-19 22:59:54 +02:00

gui

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

2016-08-03 12:24:40 +02:00

lcddisplay

use default values for freetype fontcaches (needs testing!)

2016-07-07 17:46:18 +02:00

nhttpd

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

2016-06-07 13:37:32 +02:00

system

system/httptool: make timeouts flexible

2016-07-09 14:58:40 +02:00

timerd

add/use //NI tags instead of /*NI*/; just cosmetic changes

2016-07-31 21:04:37 +02:00

zapit

add support for H265

2016-07-31 21:28:53 +02:00

create_rcsim_h.sh

…

drivertool.c

…

dt.c

…

global.h

fix 5cab4c3416

2016-05-26 00:33:07 +02:00

Makefile.am

NI \o/

2016-05-19 22:59:54 +02:00

mdev_helper.cpp

NI \o/

2016-05-19 22:59:54 +02:00

mymenu.h

NI \o/

2016-05-19 22:59:54 +02:00

neutrino_menue.cpp

Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next

2016-07-01 15:28:37 +02:00

neutrino_menue.h

Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next

2016-07-01 15:28:37 +02:00

neutrino.cpp

neutrino: add tmdb_api_key

2016-08-03 00:39:50 +02:00

neutrino.h

Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next

2016-07-01 15:28:37 +02:00

neutrinoMessages.h

neutrino/upnpbrowser: add and use new mode_upnp; ...

2016-01-25 22:43:27 +01:00

plugin.h

NI \o/

2016-05-19 22:59:54 +02:00

rcsim.c

…