diff options
| author | Forkk <forkk@forkk.net> | 2014-01-02 13:38:20 -0600 |
|---|---|---|
| committer | Forkk <forkk@forkk.net> | 2014-01-02 13:38:20 -0600 |
| commit | 17f1864a71b69b9df14d8e06ed48a65e678d09c9 (patch) | |
| tree | 4d98a2b3493a26017150d6ba8c5ae0419de3de7d /resources | |
| parent | 4495e20cd7f7f2ab062f3b60f19ac4b79f32c350 (diff) | |
| parent | aa5f2c8120cc23de0d57c9f0280512adb9a531b3 (diff) | |
| download | MultiMC-17f1864a71b69b9df14d8e06ed48a65e678d09c9.tar MultiMC-17f1864a71b69b9df14d8e06ed48a65e678d09c9.tar.gz MultiMC-17f1864a71b69b9df14d8e06ed48a65e678d09c9.tar.lz MultiMC-17f1864a71b69b9df14d8e06ed48a65e678d09c9.tar.xz MultiMC-17f1864a71b69b9df14d8e06ed48a65e678d09c9.zip | |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news
Conflicts:
CMakeLists.txt
gui/MainWindow.h
Diffstat (limited to 'resources')
0 files changed, 0 insertions, 0 deletions