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

Browse Source

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

...

This commit is contained in:

vanhofen

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

parent eff0495a4b a094b7e4fc

commit 483c39bef1

76 changed files with 4545 additions and 349 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

864

src/gui/movieplayer.cpp

File diff suppressed because it is too large Load Diff