Merge branch 'master' into develop

Conflicts:
	CMakeLists.txt
	changelog.md
This commit is contained in:
Petr Mrázek
2014-07-20 14:23:14 +02:00
2 changed files with 10 additions and 6 deletions

View File

@ -3,6 +3,9 @@
##0.5.0
- In development...
##0.4.1
- Fix LWJGL version list (SourceForge has changed the download API)
##0.4.0
- Jar support in 1.6+
- Deprecated legacy instances