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

This commit is contained in:
Joakim Kilby
2015-02-17 14:41:02 +01:00
141 changed files with 1048 additions and 1049 deletions

View File

@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2014 *
* Copyright (c) 2014-2015 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *