History

Merge branch 'master' into menu-updates

vladest committed 8 years ago

Commit c7ab1f32 parents 5a5bfcf 6ec91cf329 files · +2008 −1623Browse files

Showing the changes to interface/src/Menu.cpp (1 of 329 files). Show all

Unified · Split

interface/src/Menu.cpp+1−2
@@ -9,6 +9,7 @@ · 8 unmodified lines
99 // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
1010 //
1111
12+#include "Menu.h"
1213 #include <QDesktopServices>
1314 #include <QFileDialog>
1415 #include <QMenuBar>
@@ -54,8 +55,6 @@ · 39 unmodified lines
5455 #include "SpeechRecognizer.h"
5556 #endif
5657
57−#include "Menu.h"
58−
5958 extern bool DEV_DECIMATE_TEXTURES;
6059
6160 Menu* Menu::getInstance() {