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

Conflicts:
	src/gui/audioplayer.cpp
	src/system/localize.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: c5df56955b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-04 (Tue, 04 Jul 2017)



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

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

..

mtdutils

gcc-6.2 compil fixes

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

ansi.h

…

configure_network.cpp

…

configure_network.h

…

debug.cpp

…

debug.h

…

flashtool.cpp

flashtool: add some maybe usefull console output to reboot call

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

flashtool.h

…

fsmounter.cpp

…

fsmounter.h

…

hddstat.cpp

…

hddstat.h

…

helpers.cpp

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

2017-02-22 08:29:51 +01:00

helpers.h

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

2017-02-22 08:29:51 +01: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

audioplayer: allow to load radio-favorites.xml via menu

2017-06-28 16:26:36 +02:00

locals.h

audioplayer: allow to load radio-favorites.xml via menu

2017-06-28 16:26:36 +02:00

luaserver.cpp

…

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

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

2017-03-01 13:09:50 +01:00

setting_helpers.h

allow to disable online services w/o cleaning the keys

2016-08-08 23:11:17 +02:00

settings.cpp

…

settings.h

epgscan: allow to set rescan period to catch a bug in epgscan

2017-07-04 12:22:53 +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