Merge branch 'master' into pu/mp

This commit is contained in:
Jacek Jendrzej
2017-09-13 13:40:40 +02:00
44 changed files with 349 additions and 687 deletions

View File

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