mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-03 17:30:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Solve conflict

Browse Source
This commit is contained in:
kalbl
2016-11-23 13:34:38 +01:00
parent 5a6b076507 683fc8ee53
commit a617261bde
130 changed files with 2737 additions and 4309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/Launcher/syncwidget.cpp
+2 -1
View File
@@ -31,8 +31,9 @@
#include <ghoul/ghoul.h>
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/filesystem/file.h>
#include <ghoul/misc/dictionary.h>
#include <ghoul/logging/logmanager.h>
#include <ghoul/lua/ghoul_lua.h>
#include <ghoul/misc/dictionary.h>
#include <QApplication>
#include <QCheckBox>