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

This commit is contained in:
Andrzej Kapolka 2013-08-19 10:53:33 -07:00
commit c9f9be5d9a

View file

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