vanhofen
|
5cd7e219d8
|
fix build
Origin commit data
------------------
Commit: df6bc99337
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
Origin message was:
------------------
- fix build
|
2017-10-02 23:55:51 +02:00 |
|
vanhofen
|
260127f781
|
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
src/gui/movieplayer.cpp
src/nhttpd/tuxboxapi/controlapi.cpp
Origin commit data
------------------
Commit: f30f4da574
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
|
2017-03-01 13:09:50 +01:00 |
|
vanhofen
|
4cf2b60722
|
NI \o/
Origin commit data
------------------
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)
|
2016-05-19 22:59:54 +02:00 |
|