Merge branch 'master' into add_x11

Former-commit-id: 4ce19c22a28609978e1eb72375d3aa7bf63a91be
This commit is contained in:
johan
2014-04-30 22:34:36 +02:00
78 changed files with 5057 additions and 1952 deletions

View File

@@ -6,7 +6,7 @@
#include <QApplication>
#include <QDesktopWidget>
#include <QPixmap>
#include <Qfile>
#include <QFile>
#include <QRgb>
#include <QElapsedTimer>