History

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

Andrzej Kapolka committed 13 years ago

Commit 9d28aae2 parents c049665 96e6b454 files · +12 −11Browse files

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

Unified · Split

interface/src/Menu.cpp+1−1
@@ -685,7 +685,7 @@ bool Menu::isVoxelModeActionChecked() { · 684 unmodified lines
685}685}
686 686
687void Menu::aboutApp() {687void Menu::aboutApp() {
688 InfoView::forcedShow(this);688 InfoView::forcedShow();
689}689}
690 690
691void updateDSHostname(const QString& domainServerHostname) {691void updateDSHostname(const QString& domainServerHostname) {