Merge branch 'master' into feature/jassimp-classloader-license
authorKim Kulling <kimkulling@users.noreply.github.com>
Wed, 18 Oct 2017 07:58:37 +0000 (09:58 +0200)
committerGitHub <noreply@github.com>
Wed, 18 Oct 2017 07:58:37 +0000 (09:58 +0200)
commitb0c435a66e8d769703d09d98d124ac378513235b
treed5f6e0eabd910b2ca64aee2f07624cc5f12afbe4
parent9d2bcb56c70825c69f09c38f18d9b9ee7349cb5f
parent0b2d5de94fc81610749f3350fdddfc64ea9599e9
Merge branch 'master' into feature/jassimp-classloader-license