vanhofen af8fe3ebc6 Merge branch 'ni/mp' into ni/cst-next ...

Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)



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

2016-08-26 19:13:47 +02:00

..

Makefile.am

use the correct include path to the private headers

2015-01-28 20:53:58 +01:00

timerdclient.cpp

Merge branch 'ni/mp' into ni/cst-next

2016-08-26 19:13:47 +02:00

timerdclient.h

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

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

timerdmsg.h

…

timerdtypes.h

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

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