diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-01-12 23:04:05 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-01-12 23:04:05 +0100 |
| commit | 54a9ee5eb03b6d1be6294e47179b9eb76f7a3949 (patch) | |
| tree | 6454c95549fe42183d8b285a89517a734a6da5dc /CMakeLists.txt | |
| parent | f552366e03cd6bd693850e24503bf3bf3559cfd0 (diff) | |
| parent | 8950953d915ba234f62da93b520a1b82594cb9dc (diff) | |
| download | MultiMC-54a9ee5eb03b6d1be6294e47179b9eb76f7a3949.tar MultiMC-54a9ee5eb03b6d1be6294e47179b9eb76f7a3949.tar.gz MultiMC-54a9ee5eb03b6d1be6294e47179b9eb76f7a3949.tar.lz MultiMC-54a9ee5eb03b6d1be6294e47179b9eb76f7a3949.tar.xz MultiMC-54a9ee5eb03b6d1be6294e47179b9eb76f7a3949.zip | |
Merge branch 'feature_localization' of https://github.com/02JanDal/MultiMC5 into develop
Conflicts:
gui/dialogs/SettingsDialog.cpp
gui/dialogs/SettingsDialog.ui
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7aba8832..c0a4439b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -282,7 +282,6 @@ gui/dialogs/SettingsDialog.h gui/dialogs/SettingsDialog.cpp gui/dialogs/CopyInstanceDialog.h gui/dialogs/CopyInstanceDialog.cpp -gui/dialogs/dialogs/ gui/dialogs/NewInstanceDialog.cpp gui/dialogs/ProgressDialog.h gui/dialogs/ProgressDialog.cpp |