mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-30 15:59:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/globebrowsing

Browse Source
This commit is contained in:
Erik Broberg
2016-08-17 19:53:28 -04:00
parent dedabeb612 f8333171a8
commit d4f635513d
42 changed files with 68 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/interaction/controller.h
+1 -1
View File
@@ -50,4 +50,4 @@ protected:
} // namespace interaction
} // namespace openspace
#endif // __CONTROLLER_H__
#endif // __CONTROLLER_H__
include/openspace/interaction/deviceidentifier.h
+1 -1
View File
@@ -52,4 +52,4 @@ private:
} // namespace openspace
#endif
#endif
include/openspace/interaction/externalcontrol/externalconnectioncontroller.h
+1 -1
View File
@@ -21,4 +21,4 @@ private:
} // namespace openspace
#endif
#endif
include/openspace/interaction/externalcontrol/externalcontrol.h
+1 -1
View File
@@ -26,4 +26,4 @@ protected:
} // namespace openspace
#endif
#endif