summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorSky <git@bunnies.cc>2013-11-27 22:51:45 +0000
committerSky <git@bunnies.cc>2013-11-27 22:51:45 +0000
commitd32cb1c95d5c1a50c322085cdfe4bf3f991431e7 (patch)
tree8a31c6ed1c2da0513596d8bb82dc439101a7aec9 /CMakeLists.txt
parent70973d111a35c65072b9431420d3d854bd82e8f5 (diff)
parenta4c5f0135ef8e3671f54cf56b1aa8766ee4b4a20 (diff)
downloadMultiMC-d32cb1c95d5c1a50c322085cdfe4bf3f991431e7.tar
MultiMC-d32cb1c95d5c1a50c322085cdfe4bf3f991431e7.tar.gz
MultiMC-d32cb1c95d5c1a50c322085cdfe4bf3f991431e7.tar.lz
MultiMC-d32cb1c95d5c1a50c322085cdfe4bf3f991431e7.tar.xz
MultiMC-d32cb1c95d5c1a50c322085cdfe4bf3f991431e7.zip
Merge remote-tracking branch 'upstream/feature_yggdrasil' into develop
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c831205b..e5f9dcf0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -219,6 +219,8 @@ gui/dialogs/CustomMessageBox.h
gui/dialogs/CustomMessageBox.cpp
gui/dialogs/AccountListDialog.h
gui/dialogs/AccountListDialog.cpp
+gui/dialogs/AccountSelectDialog.h
+gui/dialogs/AccountSelectDialog.cpp
# GUI - widgets
gui/widgets/InstanceDelegate.h
@@ -374,6 +376,7 @@ gui/dialogs/LegacyModEditDialog.ui
gui/dialogs/OneSixModEditDialog.ui
gui/dialogs/EditNotesDialog.ui
gui/dialogs/AccountListDialog.ui
+gui/dialogs/AccountSelectDialog.ui
# Widgets/other
gui/widgets/MCModInfoFrame.ui