History

Merge branch 'master' of https://github.com/worklist/hifi into shifty

Andrzej Kapolka committed 13 years ago

Commit 834b6712 parents 0a9db6a fa53e5d43 files · +356 −388Browse files

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

Unified · Split

interface/src/Application.cpp+8−0
@@ -237,6 +237,14 @@ Application::~Application() { · 236 unmodified lines
237 NodeList::getInstance()->removeHook(this);237 NodeList::getInstance()->removeHook(this);
238 238
239 _sharedVoxelSystem.changeTree(new VoxelTree);239 _sharedVoxelSystem.changeTree(new VoxelTree);
240
241 delete Menu::getInstance();
242
243 delete _oculusProgram;
244 delete _settings;
245 delete _networkAccessManager;
246 delete _followMode;
247 delete _glWidget;
240}248}
241 249
242void Application::initializeGL() {250void Application::initializeGL() {

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