vanhofen
|
6bda6dbce7
|
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
------------------
Commit: ae4307bc1c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)
|
2017-11-02 23:25:41 +01:00 |
|
vanhofen
|
9683d48f00
|
yWeb: signalize standby-mode in status-button's color; thx to fred_feuerstein
Signed-off-by: Thilo Graf <dbt@novatux.de>
Origin commit data
------------------
Commit: 0ea08ea28a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)
Origin message was:
------------------
- yWeb: signalize standby-mode in status-button's color; thx to fred_feuerstein
Signed-off-by: Thilo Graf <dbt@novatux.de>
|
2017-10-29 18:33:08 +01:00 |
|
vanhofen
|
700e670b32
|
yWeb: fix 4eff70753a
Origin commit data
------------------
Commit: a19a08636f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-19 (Thu, 19 Oct 2017)
Origin message was:
------------------
- yWeb: fix 4eff70753a
|
2017-10-19 16:06:42 +02:00 |
|
vanhofen
|
4eff70753a
|
yWeb: signalize standby-mode in status-button's color; thx to fred_feuerstein
Origin commit data
------------------
Commit: e4f29657ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)
Origin message was:
------------------
- yWeb: signalize standby-mode in status-button's color; thx to fred_feuerstein
|
2017-10-16 12:05:35 +02:00 |
|
vanhofen
|
0a874ca762
|
yWeb: move data from /src to /data
Origin commit data
------------------
Commit: 29847283ad
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)
Origin message was:
------------------
- yWeb: move data from /src to /data
|
2016-12-15 14:00:45 +01:00 |
|