recycled-ni-neutrino

mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 15:02:50 +02:00

Files

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

Conflicts:
	acinclude.m4
	configure.ac
	data/fonts/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	data/webtv/Makefile.am
	data/y-web/Y_Tools_Boxcontrol.yhtm
	data/y-web/Y_Tools_Screenshot.yhtm
	lib/hardware/coolstream/hardware_caps.h
	lib/libtuxtxt/tuxtxt_common.h
	src/gui/audioplayer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/movieplayer.h
	src/gui/network_setup.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: ae4307bc1c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)



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

2017-11-02 23:25:41 +01:00

connection

lib/connection/basicserver: raise queue limit

2014-09-29 14:38:20 +04:00

hardware/coolstream

rename can_set_display_brightness => display_can_set_brightness

2017-11-02 21:23:01 +01:00

jsoncpp

add comments to suppres -Wimplicit-fallthrough warnings

2017-09-26 12:41:05 +02:00

libconfigfile

fix compil use good oprator