History

Bad merge fix

stojce committed 12 years ago

Commit 303fddd1 parent 3ced4c91 file · +0 −2Browse files

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

Unified · Split

interface/src/Menu.cpp+0−2
@@ -71,8 +71,6 @@ Menu::Menu() : · 70 unmodified lines
71 _boundaryLevelAdjust(0),71 _boundaryLevelAdjust(0),
72 _maxVoxelPacketsPerSecond(DEFAULT_MAX_VOXEL_PPS),72 _maxVoxelPacketsPerSecond(DEFAULT_MAX_VOXEL_PPS),
73 _lastAdjust(usecTimestampNow()),73 _lastAdjust(usecTimestampNow()),
74 _loginAction(NULL)
75 _lastAdjust(usecTimestampNow()),
76 _preferencesDialog()74 _preferencesDialog()
77{75{
78 Application *appInstance = Application::getInstance();76 Application *appInstance = Application::getInstance();

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t