History

fix merge

Brad Hefta-Gaub committed 10 years ago

Commit 5b9607c1 parent 6ac9b731 file · +0 −2Browse files

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

Unified · Split

interface/src/Application.cpp+0−2
@@ -448,8 +448,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : · 447 unmodified lines
448 448
449 _bookmarks = new Bookmarks(); // Before setting up the menu449 _bookmarks = new Bookmarks(); // Before setting up the menu
450 450
451 _runningScriptsWidget = new RunningScriptsWidget(_window);
452
453 // start the nodeThread so its event loop is running451 // start the nodeThread so its event loop is running
454 QThread* nodeThread = new QThread(this);452 QThread* nodeThread = new QThread(this);
455 nodeThread->setObjectName("NodeList Thread");453 nodeThread->setObjectName("NodeList Thread");