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

Bad merge fix

Browse source
This commit is contained in:
stojce 2014-02-25 21:19:43 +01:00
parent 3ced4c9bef
commit 303fddd93b
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Menu.cpp
View file

@ -71,8 +71,6 @@ Menu::Menu() :
_boundaryLevelAdjust(0), _boundaryLevelAdjust(0),
_maxVoxelPacketsPerSecond(DEFAULT_MAX_VOXEL_PPS), _maxVoxelPacketsPerSecond(DEFAULT_MAX_VOXEL_PPS),
_lastAdjust(usecTimestampNow()), _lastAdjust(usecTimestampNow()),
_loginAction(NULL)
_lastAdjust(usecTimestampNow()),
_preferencesDialog() _preferencesDialog()
{ {
Application *appInstance = Application::getInstance(); Application *appInstance = Application::getInstance();