mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-04 18:11:01 -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/util/camera.h
+1 -1
View File
@@ -218,4 +218,4 @@ namespace openspace {
};
} // namespace openspace
#endif // __CAMERA_H__
#endif // __CAMERA_H__
include/openspace/util/syncbuffer.h
+1 -1
View File
@@ -116,4 +116,4 @@ private:
} // namespace openspace
#endif // SYNCBUFFER_H
#endif // SYNCBUFFER_H