diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-07-08 01:10:45 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-07-08 01:10:45 +0200 |
| commit | 19278c853b8ee940240e14e9d9c7cbe52cb760af (patch) | |
| tree | a5897769e5930bb0677b5634ddb417b8cb76d9cc /mmc_updater/src/UpdaterOptions.cpp | |
| parent | f72a38b06cfa1935fc33958157262df94b484d97 (diff) | |
| parent | b3cf19190fe805367686af0f0c2cbbc8b00176d4 (diff) | |
| download | MultiMC-19278c853b8ee940240e14e9d9c7cbe52cb760af.tar MultiMC-19278c853b8ee940240e14e9d9c7cbe52cb760af.tar.gz MultiMC-19278c853b8ee940240e14e9d9c7cbe52cb760af.tar.lz MultiMC-19278c853b8ee940240e14e9d9c7cbe52cb760af.tar.xz MultiMC-19278c853b8ee940240e14e9d9c7cbe52cb760af.zip | |
Merge branch 'master' into develop
Conflicts:
CMakeLists.txt
changelog.yaml
logic/forge/ForgeInstaller.cpp
Diffstat (limited to 'mmc_updater/src/UpdaterOptions.cpp')
0 files changed, 0 insertions, 0 deletions