Michael Liebmann 78a5a4a658 Merge branch 'master' into pu/fb-setmode ...

Fix merge conflict


Origin commit data
------------------
Branch: ni/coolstream
Commit: 65f81b146d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-14 (Tue, 14 Feb 2017)



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

2017-02-14 20:11:08 +01: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

Merge branch 'master' into pu/fb-modules

2017-02-12 09:24:08 +01:00

flashtool.h

system/flashtool.cpp: add timestamp

2014-10-20 14:14:39 +04:00

fsmounter.cpp

global.h: Use forward-declarations to reduce number of dependencies

2015-04-16 13:39:35 +02:00

fsmounter.h

convert most char[...] configuration values to std::string

2013-12-25 12:08:14 +01:00

hddstat.cpp

hddstat.cpp: move init of cHddStat inside geInstance()

2014-11-13 10:48:05 +01:00

hddstat.h

add thread for determining free hdd (recording dir) space, enable hdd usage icons on vfd (untested)

2014-09-11 17:58:19 +04:00

helpers.cpp

system/helpers: disable GetWidth4FB_HW_ACC()

2017-02-14 20:01:55 +01:00

helpers.h

system/helpers: disable GetWidth4FB_HW_ACC()

2017-02-14 20:01:55 +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

system/lastchannel.cpp: cleanup unused channelnr

2014-10-10 15:26:32 +04:00

lastchannel.h

system/lastchannel.cpp: cleanup unused channelnr

2014-10-10 15:26:32 +04:00

localize.cpp

src/system/localize.cpp Undefined allocation of 0 bytes

2016-06-04 16:19:57 +02:00

localize.h

system/localize: change memory allocation, no user-visible changes

2013-11-13 11:56:11 +01:00

locals_intern.h

neutrino: Add switch osd resolution when supported from hardware

2017-02-13 12:51:14 +01:00

locals.h

neutrino: Add switch osd resolution when supported from hardware

2017-02-13 12:51:14 +01:00

luaserver.cpp

replace __FILE__ with __file__

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

luaserver.h

system/luaserver: Terminate Lua script when luaclient dies.

2014-10-14 10:27:37 +02:00

Makefile.am

configure: Rename hardware defined macros for coolstream stb

2017-02-12 09:21:04 +01:00

ping-config.h

…

ping-linux.h

…

ping.cpp

gui/nfs: implement mac address lookup

2014-09-15 14:04:20 +04:00

ping.h

gui/nfs: implement mac address lookup

2014-09-15 14:04:20 +04:00

set_threadname.h

system/set_threadname: fix

2014-09-15 17:13:27 +04:00

setting_helpers.cpp

neutrino: Rename hardware defined macros for coolstream stb

2017-02-12 09:21:04 +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

gui/scan_setup.cpp: add pilot param to manual scan menu

2014-12-18 17:31:55 +03:00

settings.h

neutrino: Add switch osd resolution when supported from hardware

2017-02-13 12:51:14 +01:00

stacktrace.cpp

system/stacktrace.cpp: add backtrace function for debugging, define HAVE_BACKTRACE to enable code

2015-03-06 14:13:59 +03:00

stacktrace.h

system/stacktrace.cpp: add backtrace function for debugging, define HAVE_BACKTRACE to enable code

2015-03-06 14:13:59 +03:00

sysload.cpp

src/system/sysload.cpp: fix possible divide by zero bug, stats are not guarantueed to be different for each sample.

2015-02-22 17:23:16 +03:00

sysload.h

gui/dboxinfo: move cpu load calculation to dedicated thread ...

2013-12-30 01:51:20 +01:00

ytcache.cpp

some inits

2017-01-30 17:22:41 +01:00

ytcache.h

system/ytcache: add progress data

2014-09-24 19:50:35 +04:00

ytparser.cpp

cYTFeedParser: add signal OnLoadVideoInfo

2017-02-13 10:03:38 +01:00

ytparser.h

cYTFeedParser: add signal OnLoadVideoInfo

2017-02-13 10:03:38 +01:00