Merge branch 'master' into feature/jassimp-classloader
authorKim Kulling <kimkulling@users.noreply.github.com>
Sat, 14 Oct 2017 13:59:55 +0000 (15:59 +0200)
committerGitHub <noreply@github.com>
Sat, 14 Oct 2017 13:59:55 +0000 (15:59 +0200)
commit5e739acfa1ea4c0205faaa462fae97a0f5246a0f
treea1582da83c8386bb1cc2f526656cb1152ce2cee1
parenta7c1dde56e3ae4af5eaef801e938ee9e2265ecfb
parent01510dfe1bff8349d7d0a48b16a356faa4e97bbb
Merge branch 'master' into feature/jassimp-classloader