mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 11:39:49 -06:00
Code Issues Packages Projects Releases Wiki Activity
Files
171aa461502a43f10cd85b04c7052a442dc6044e
OpenSpace/include/openspace
History
Sebastian Piwell 171aa46150 Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage 
Conflicts:
	include/openspace/rendering/screenspacerenderable.h
	modules/base/rendering/screenspaceimage.cpp
	src/rendering/screenspacerenderable.cpp
2016-03-16 17:42:13 -04:00
..
engine
- Add currentDrawBufferResolution method in WindowWrapper
2016-02-09 10:46:51 +01:00
interaction
Updated copyright header
2016-02-05 17:43:21 +01:00
network
Updated copyright header
2016-02-05 17:43:21 +01:00
properties
Updated copyright header
2016-02-05 17:43:21 +01:00
query
Updated copyright header
2016-02-05 17:43:21 +01:00
rendering
Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage
2016-03-16 17:42:13 -04:00
scene
Updated copyright header
2016-02-05 17:43:21 +01:00
scripting
Removing Jenkins warnings
2016-02-05 23:28:45 +01:00
util
Removing Jenkins warnings
2016-02-05 23:28:45 +01:00