diff options
author | Sky <git@bunnies.cc> | 2013-11-03 23:53:31 +0000 |
---|---|---|
committer | Sky <git@bunnies.cc> | 2013-11-03 23:53:31 +0000 |
commit | dc3b0fcb2b74aeede37b08216b203cab284f7fce (patch) | |
tree | ce4c2c3a2786bdbb9752c26d6feaab3735ba9bd6 /CMakeLists.txt | |
parent | 406d8511bdc7b857a200b29e7d6e2fd81eda0f8e (diff) | |
parent | d6e4fb29713d6ce55b092c0e22412f6121e7f516 (diff) | |
download | MultiMC-dc3b0fcb2b74aeede37b08216b203cab284f7fce.tar MultiMC-dc3b0fcb2b74aeede37b08216b203cab284f7fce.tar.gz MultiMC-dc3b0fcb2b74aeede37b08216b203cab284f7fce.tar.lz MultiMC-dc3b0fcb2b74aeede37b08216b203cab284f7fce.tar.xz MultiMC-dc3b0fcb2b74aeede37b08216b203cab284f7fce.zip |
Merge branch 'develop'
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5da43a0b..cb24499f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -183,6 +183,8 @@ gui/mainwindow.h gui/mainwindow.cpp gui/settingsdialog.h gui/settingsdialog.cpp +gui/CopyInstanceDialog.h +gui/CopyInstanceDialog.cpp gui/newinstancedialog.h gui/newinstancedialog.cpp gui/logindialog.h @@ -322,6 +324,8 @@ logic/tasks/Task.cpp # Utilities logic/JavaUtils.h logic/JavaUtils.cpp +logic/NagUtils.h +logic/NagUtils.cpp ) @@ -330,6 +334,7 @@ logic/JavaUtils.cpp SET(MULTIMC_UIS gui/mainwindow.ui gui/settingsdialog.ui +gui/CopyInstanceDialog.ui gui/newinstancedialog.ui gui/logindialog.ui gui/aboutdialog.ui |