Merge branch 'develop'

This commit is contained in:
Alexander Bock
2016-03-03 00:39:17 +01:00

2
.gitmodules vendored
View File

@@ -3,4 +3,4 @@
url = https://github.com/OpenSpace/Ghoul.git
[submodule "modules/kameleon/ext/kameleon"]
path = modules/kameleon/ext/kameleon
url = git@openspace.itn.liu.se:/kameleon
url = https://github.com/OpenSpace/Kameleon.git