diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-07-08 01:10:45 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-07-08 01:10:45 +0200 |
| commit | 19278c853b8ee940240e14e9d9c7cbe52cb760af (patch) | |
| tree | a5897769e5930bb0677b5634ddb417b8cb76d9cc | |
| parent | f72a38b06cfa1935fc33958157262df94b484d97 (diff) | |
| parent | b3cf19190fe805367686af0f0c2cbbc8b00176d4 (diff) | |
| download | MultiMC-19278c853b8ee940240e14e9d9c7cbe52cb760af.tar MultiMC-19278c853b8ee940240e14e9d9c7cbe52cb760af.tar.gz MultiMC-19278c853b8ee940240e14e9d9c7cbe52cb760af.tar.lz MultiMC-19278c853b8ee940240e14e9d9c7cbe52cb760af.tar.xz MultiMC-19278c853b8ee940240e14e9d9c7cbe52cb760af.zip | |
Merge branch 'master' into develop
Conflicts:
CMakeLists.txt
changelog.yaml
logic/forge/ForgeInstaller.cpp
| -rw-r--r-- | changelog.yaml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/changelog.yaml b/changelog.yaml index f0fe01cb..e3d6a782 100644 --- a/changelog.yaml +++ b/changelog.yaml @@ -86,5 +86,7 @@ - Fixed forge for 1.7.10-pre4 (and any future prereleases) 0.3.8 - Workaround for performance issues with Intel integrated graphics chips +0.3.9 + - Workaround for 1.7.10 Forge 0.4.0 - In Development... |