mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-05 02:20:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflict

Browse Source
This commit is contained in:
Sebastian Piwell
2016-03-30 17:46:21 -04:00
parent 232bd6d94c 0feb7fb771
commit f925a35aee
6 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/iswa/rendering/iswacygnet.cpp
+1
View File
@@ -69,6 +69,7 @@ bool ISWACygnet::initialize(){
bool ISWACygnet::deinitialize(){
_parent = nullptr;
return true;
}
void ISWACygnet::render(){