diff options
author | Petr Mrázek <peterix@gmail.com> | 2014-04-21 21:39:02 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2014-04-21 21:39:02 +0200 |
commit | e955b1c6f9390538a7330babc3da2e31d61f5a85 (patch) | |
tree | 08d985ccf172a3999379fe7583b650919ebf0fd8 /CMakeLists.txt | |
parent | c8f468057ed9c25546f3cd6b968f2c2213304ac1 (diff) | |
parent | 89edc3e15edde37fb9fee2c0e0b98ea13c9b9197 (diff) | |
download | PrismLauncher-e955b1c6f9390538a7330babc3da2e31d61f5a85.tar.gz PrismLauncher-e955b1c6f9390538a7330babc3da2e31d61f5a85.tar.bz2 PrismLauncher-e955b1c6f9390538a7330babc3da2e31d61f5a85.zip |
Merge remote-tracking branch 'origin/feature_new_login_dialog2' into develop
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ef81c53a..1741d65c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -303,6 +303,8 @@ gui/dialogs/CustomMessageBox.h gui/dialogs/CustomMessageBox.cpp gui/dialogs/EditAccountDialog.h gui/dialogs/EditAccountDialog.cpp +gui/dialogs/LoginDialog.h +gui/dialogs/LoginDialog.cpp gui/dialogs/AccountListDialog.h gui/dialogs/AccountListDialog.cpp gui/dialogs/AccountSelectDialog.h @@ -565,6 +567,7 @@ gui/dialogs/EditNotesDialog.ui gui/dialogs/AccountListDialog.ui gui/dialogs/AccountSelectDialog.ui gui/dialogs/EditAccountDialog.ui +gui/dialogs/LoginDialog.ui gui/dialogs/UpdateDialog.ui gui/dialogs/ScreenshotDialog.ui gui/dialogs/NotificationDialog.ui |