Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop

This commit is contained in:
Hans-Christian Helltegen
2014-05-14 14:30:19 -04:00
3 changed files with 4 additions and 1 deletions

1
.gitignore vendored
View File

@@ -1,7 +1,6 @@
bin/
build/
ext/SGCT
ext/kameleon
.DS_Store
*.swp

3
.gitmodules vendored
View File

@@ -7,3 +7,6 @@
[submodule "openspace-data"]
path = openspace-data
url = git@openspace.itn.liu.se:/openspace-data
[submodule "ext/kameleon"]
path = ext/kameleon
url = git@openspace.itn.liu.se:/kameleon

1
ext/kameleon Submodule

Submodule ext/kameleon added at 9c9dbe3c17