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
9// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html9// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
10//10//
11 11
12#include "Menu.h"
12#include <QDesktopServices>13#include <QDesktopServices>
13#include <QFileDialog>14#include <QFileDialog>
14#include <QMenuBar>15#include <QMenuBar>
@@ -54,8 +55,6 @@ · 39 unmodified lines
54#include "SpeechRecognizer.h"55#include "SpeechRecognizer.h"
55#endif56#endif
56 57
57#include "Menu.h"
58
59extern bool DEV_DECIMATE_TEXTURES;58extern bool DEV_DECIMATE_TEXTURES;
60 59
61Menu* Menu::getInstance() {60Menu* Menu::getInstance() {