History

Merge branch 'master' into 21235

# Conflicts: # interface/src/Menu.cpp # interface/src/ui/DialogsManager.h

David Rowe committed 9 years ago

Commit e3b9d582 parents 939b4f1 652c80011 files · +177 −236Browse files

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

Unified · Split

interface/src/Menu.cpp+0−2
@@ -562,8 +562,6 @@ Menu::Menu() { · 561 unmodified lines
562 false,562 false,
563 &UserActivityLogger::getInstance(),563 &UserActivityLogger::getInstance(),
564 SLOT(disable(bool)));564 SLOT(disable(bool)));
565 addActionToQMenuAndActionHash(networkMenu, MenuOption::CachesSize, 0,
566 dialogsManager.data(), SLOT(cachesSizeDialog()));
567 addActionToQMenuAndActionHash(networkMenu, MenuOption::ShowDSConnectTable, 0,565 addActionToQMenuAndActionHash(networkMenu, MenuOption::ShowDSConnectTable, 0,
568 dialogsManager.data(), SLOT(showDomainConnectionDialog()));566 dialogsManager.data(), SLOT(showDomainConnectionDialog()));
569 567