Merge branch 'master' into devel

This commit is contained in:
jfmcarreira committed 2018-01-31 02:25:36 +00:00
commit 0fa65ed836
8 files changed
+175 -9

No files matched your search

+1 -1
View File
@@ -207,7 +207,7 @@ private:
protected:
Void keyPressEvent( QKeyEvent* event );
Void resizeEvent( QResizeEvent* event );
Void closeEvent( QCloseEvent *event );
Void closeEvent( QCloseEvent* event );
public Q_SLOTS:
void updateWindowOnTimeout();