diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-11-24 18:41:35 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-11-24 18:41:35 +0100 |
| commit | 82225a21e1b7f1671a42c1511032c59ecda0503f (patch) | |
| tree | bed0663df62a7210da6928c50a6ba99aed53cd1f /gui/MainWindow.ui | |
| parent | ca297fca79a7b1b96e41ba5abed4956af9383c16 (diff) | |
| parent | 75e7932607bdd84d2867765eb6f07dcec95ee193 (diff) | |
| download | MultiMC-82225a21e1b7f1671a42c1511032c59ecda0503f.tar MultiMC-82225a21e1b7f1671a42c1511032c59ecda0503f.tar.gz MultiMC-82225a21e1b7f1671a42c1511032c59ecda0503f.tar.lz MultiMC-82225a21e1b7f1671a42c1511032c59ecda0503f.tar.xz MultiMC-82225a21e1b7f1671a42c1511032c59ecda0503f.zip | |
Merge branch 'feature_yggdrasil' into develop
Conflicts:
gui/MainWindow.cpp
logic/OneSixInstance.h
Fix missing session id functionality for legacy and old onesix.
Diffstat (limited to 'gui/MainWindow.ui')
| -rw-r--r-- | gui/MainWindow.ui | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui index 6f70fc98..f76d4d4e 100644 --- a/gui/MainWindow.ui +++ b/gui/MainWindow.ui @@ -70,6 +70,7 @@ <addaction name="separator"/> <addaction name="actionCheckUpdate"/> <addaction name="actionSettings"/> + <addaction name="actionManageAccounts"/> <addaction name="separator"/> <addaction name="actionReportBug"/> <addaction name="actionNews"/> @@ -465,6 +466,14 @@ <string>Add a new instance.</string> </property> </action> + <action name="actionManageAccounts"> + <property name="text"> + <string>Manage Accounts</string> + </property> + <property name="toolTip"> + <string>Manage your Mojang or Minecraft accounts.</string> + </property> + </action> </widget> <layoutdefault spacing="6" margin="11"/> <resources> |