diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-07-20 14:23:14 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-07-20 14:23:14 +0200 |
| commit | c91adfb3d18b124b36cf19bcb89973a66c9ef1c9 (patch) | |
| tree | 8804c72e1e73661d98c67af889507e2515d8a55b /gui/pages/global/MinecraftPage.h | |
| parent | c767707c951bff6ff525a507be0393119e050b40 (diff) | |
| parent | 77d9360d25c3bee476866dc8d248ff6bde7d9c74 (diff) | |
| download | MultiMC-c91adfb3d18b124b36cf19bcb89973a66c9ef1c9.tar MultiMC-c91adfb3d18b124b36cf19bcb89973a66c9ef1c9.tar.gz MultiMC-c91adfb3d18b124b36cf19bcb89973a66c9ef1c9.tar.lz MultiMC-c91adfb3d18b124b36cf19bcb89973a66c9ef1c9.tar.xz MultiMC-c91adfb3d18b124b36cf19bcb89973a66c9ef1c9.zip | |
Merge branch 'master' into develop
Conflicts:
CMakeLists.txt
changelog.md
Diffstat (limited to 'gui/pages/global/MinecraftPage.h')
0 files changed, 0 insertions, 0 deletions