Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bc4a80094
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-09 08:44:18 +02:00
25 changed files with 0 additions and 33 deletions

View File

@@ -53,7 +53,6 @@
#include "widget/shellwindow.h"
#include <poll.h>
#include <fcntl.h>
#include <vector>
#include <video.h>