diff options
| author | Forkk <forkk@forkk.net> | 2014-01-07 18:47:06 -0600 |
|---|---|---|
| committer | Forkk <forkk@forkk.net> | 2014-01-07 18:47:06 -0600 |
| commit | 8dfc1028ee2bcc17e2719ea8fc1bff8077f7aaaf (patch) | |
| tree | df2a719ebb12f129165c487ab730a6328c9750e7 /MultiMC.cpp | |
| parent | fb83299e592ef7627d5914e0fbce70c570981124 (diff) | |
| parent | 3629f9b9995e375dad181268f5a70dc6cb7697a2 (diff) | |
| download | MultiMC-8dfc1028ee2bcc17e2719ea8fc1bff8077f7aaaf.tar MultiMC-8dfc1028ee2bcc17e2719ea8fc1bff8077f7aaaf.tar.gz MultiMC-8dfc1028ee2bcc17e2719ea8fc1bff8077f7aaaf.tar.lz MultiMC-8dfc1028ee2bcc17e2719ea8fc1bff8077f7aaaf.tar.xz MultiMC-8dfc1028ee2bcc17e2719ea8fc1bff8077f7aaaf.zip | |
Merge branch 'new-version-system' into develop
Diffstat (limited to 'MultiMC.cpp')
| -rw-r--r-- | MultiMC.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MultiMC.cpp b/MultiMC.cpp index 7c411693..17fc2e0a 100644 --- a/MultiMC.cpp +++ b/MultiMC.cpp @@ -38,8 +38,8 @@ using namespace Util::Commandline; MultiMC::MultiMC(int &argc, char **argv, bool root_override) - : QApplication(argc, argv), m_version{VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD, - VERSION_CHANNEL, VERSION_BUILD_TYPE} + : QApplication(argc, argv), m_version{VERSION_MAJOR, VERSION_MINOR, VERSION_HOTFIX, + VERSION_BUILD, MultiMCVersion::VERSION_TYPE, VERSION_CHANNEL, BUILD_PLATFORM} { setOrganizationName("MultiMC"); setApplicationName("MultiMC5"); |