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

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

Browse source
This commit is contained in:
atlante45 2013-08-19 10:54:35 -07:00
commit b4157593c5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -217,8 +217,8 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
FvUpdater::sharedUpdater()->CheckForUpdatesSilent(); FvUpdater::sharedUpdater()->CheckForUpdatesSilent();
#endif #endif
// call Menu getInstance static method to set up the menur // call Menu getInstance static method to set up the menu
Menu::getInstance(); _window->setMenuBar(Menu::getInstance());
_networkAccessManager = new QNetworkAccessManager(this); _networkAccessManager = new QNetworkAccessManager(this);