Merge remote-tracking branch 'tuxbox/master'

This commit is contained in:
Stefan Seyfried
2016-12-04 18:02:51 +01:00
135 changed files with 3933 additions and 3385 deletions

View File

@@ -52,7 +52,7 @@
#include <zapit/client/zapittools.h>
#include "widget/shellwindow.h"
#include "widget/messagebox.h"
#include <poll.h>
#include <fcntl.h>
#include <vector>