Merge branch 'master' into develop

Conflicts:
	CMakeLists.txt
	changelog.yaml
	logic/forge/ForgeInstaller.cpp
This commit is contained in:
Petr Mrázek 2014-07-08 01:10:45 +02:00
commit 19278c853b

View File

@ -86,5 +86,7 @@
- Fixed forge for 1.7.10-pre4 (and any future prereleases) - Fixed forge for 1.7.10-pre4 (and any future prereleases)
0.3.8 0.3.8
- Workaround for performance issues with Intel integrated graphics chips - Workaround for performance issues with Intel integrated graphics chips
0.3.9
- Workaround for 1.7.10 Forge
0.4.0 0.4.0
- In Development... - In Development...