vanhofen 4dc0113a94 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox ...

Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/info_menue.cpp
	src/gui/widget/menue.cpp
	src/nhttpd/yconfig.h
	src/system/helpers.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9152c228ed
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)



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

2017-09-14 16:23:15 +02:00

..

mtdutils

gcc-6.2 compil fixes

2017-01-21 14:01:05 +01:00

configure_network.cpp

system/configure_network.cpp: try to support open wlan, if psk empty

2015-11-06 17:23:41 +03:00

configure_network.h

…

debug.cpp

…

debug.h

make various dprintf macros safer for general usage

2016-01-05 15:06:18 +01:00

flashtool.cpp

flashtool: add some maybe usefull console output to reboot call

2017-05-19 10:14:51 +02:00

flashtool.h

NI \o/

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

fsmounter.cpp

NI \o/

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

fsmounter.h

…

hddstat.cpp

…

hddstat.h

…

helpers.cpp

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-09-14 16:23:15 +02:00

helpers.h

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-09-14 16:23:15 +02:00

httptool.cpp

Merge branch 'master' into pu/fb-modules

2017-02-09 08:46:47 +01:00

httptool.h

change to CURLOPT_CONNECTTIMEOUT_MS and ...

2017-02-09 08:33:48 +01:00

lastchannel.cpp

…

lastchannel.h

…

localize.cpp

localize: add getString() function for a smoother string handling

2017-05-29 11:49:00 +02:00

localize.h

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-07-04 14:06:36 +02:00

locals_intern.h

rework multimedia-menu code; cleanup from many unused code

2017-09-13 15:52:19 +02:00

locals.h

rework multimedia-menu code; cleanup from many unused code

2017-09-13 15:52:19 +02:00

luaserver.cpp

replace __FILE__ with __file__

2016-01-14 22:29:00 +01:00

luaserver.h

…

Makefile.am

jsoncpp: update to current version 1.8.0

2017-03-28 21:23:10 +02:00

ping-config.h

…

ping-linux.h

…

ping.cpp

…

ping.h

…

set_threadname.h

…

setting_helpers.cpp

move CNITouchFileNotifier to CFlagFileNotifier

2017-09-12 22:30:34 +02:00

setting_helpers.h

move CNITouchFileNotifier to CFlagFileNotifier

2017-09-12 22:30:34 +02:00

settings.cpp

drop ni-menu

2017-09-12 22:30:35 +02:00

settings.h

drop easymenu

2017-09-13 13:35:23 +02:00

stacktrace.cpp

…

stacktrace.h

…

sysload.cpp

…

sysload.h

…

ytcache.cpp

try fix YT cache wirite to root

2017-03-05 17:06:22 +01:00

ytcache.h

move movieinfo.cpp|h from src/gui to src/driver ...

2017-03-20 14:30:44 +01:00

ytparser.cpp

CMovieBrowser/cYTFeedParser: implement signals from CProgressSignals

2017-03-06 21:26:26 +01:00

ytparser.h

CMovieBrowser/cYTFeedParser: implement signals from CProgressSignals

2017-03-06 21:26:26 +01:00