Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 17:39:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed header file merge conflict

Browse source
This commit is contained in:
ZappoMan 2013-11-01 14:37:46 -07:00
parent f5d09c0218
commit 6fd3c9714f
2 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.h
View file

@ -61,6 +61,7 @@
#include "ui/ChatEntry.h" #include "ui/ChatEntry.h"
#include "ui/VoxelStatsDialog.h" #include "ui/VoxelStatsDialog.h"
#include "ui/RearMirrorTools.h" #include "ui/RearMirrorTools.h"
#include "ui/LodToolsDialog.h"
class QAction; class QAction;
class QActionGroup; class QActionGroup;

1
interface/src/Menu.cpp
View file

@ -29,7 +29,6 @@
#include "Menu.h" #include "Menu.h"
#include "Util.h" #include "Util.h"
#include "InfoView.h" #include "InfoView.h"
#include "ui/LodToolsDialog.h"
Menu* Menu::_instance = NULL; Menu* Menu::_instance = NULL;