diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-11-24 18:41:35 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-11-24 18:41:35 +0100 |
| commit | 82225a21e1b7f1671a42c1511032c59ecda0503f (patch) | |
| tree | bed0663df62a7210da6928c50a6ba99aed53cd1f /logic/MinecraftProcess.cpp | |
| parent | ca297fca79a7b1b96e41ba5abed4956af9383c16 (diff) | |
| parent | 75e7932607bdd84d2867765eb6f07dcec95ee193 (diff) | |
| download | MultiMC-82225a21e1b7f1671a42c1511032c59ecda0503f.tar MultiMC-82225a21e1b7f1671a42c1511032c59ecda0503f.tar.gz MultiMC-82225a21e1b7f1671a42c1511032c59ecda0503f.tar.lz MultiMC-82225a21e1b7f1671a42c1511032c59ecda0503f.tar.xz MultiMC-82225a21e1b7f1671a42c1511032c59ecda0503f.zip | |
Merge branch 'feature_yggdrasil' into develop
Conflicts:
gui/MainWindow.cpp
logic/OneSixInstance.h
Fix missing session id functionality for legacy and old onesix.
Diffstat (limited to 'logic/MinecraftProcess.cpp')
0 files changed, 0 insertions, 0 deletions