Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop | Petr Mrázek | 2013-12-10 | -0/+9 |
| | | | | | | Conflicts: CMakeLists.txt gui/MainWindow.cpp | |||
* | Finish assets update for 1.7.3 | Petr Mrázek | 2013-12-10 | -0/+129 |