diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-02-01 19:37:16 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-02-01 19:37:16 +0100 |
| commit | 1936bd181f57a554ce0dd757ffe9419100eb47f4 (patch) | |
| tree | a22660979335746b930c88f353b4e29f1bbe9a2a /main.cpp | |
| parent | b4b6091372310f4a811180cffde3ea5611881e6c (diff) | |
| parent | 8637cce4333aaf56a231d5fab866b0e770436783 (diff) | |
| download | MultiMC-1936bd181f57a554ce0dd757ffe9419100eb47f4.tar MultiMC-1936bd181f57a554ce0dd757ffe9419100eb47f4.tar.gz MultiMC-1936bd181f57a554ce0dd757ffe9419100eb47f4.tar.lz MultiMC-1936bd181f57a554ce0dd757ffe9419100eb47f4.tar.xz MultiMC-1936bd181f57a554ce0dd757ffe9419100eb47f4.zip | |
Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 into feature_derpstances
Conflicts:
gui/dialogs/OneSixModEditDialog.cpp
logic/OneSixUpdate.cpp
Diffstat (limited to 'main.cpp')
0 files changed, 0 insertions, 0 deletions