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

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

Browse Source
This commit is contained in:
Emil Axelsson
2017-12-04 10:52:12 +01:00
parent f3aeecaf23 38338725b9
commit fb675dfeab
175 changed files with 5984 additions and 4556 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/parallelconnection.cpp
+1 -2
View File
@@ -1235,8 +1235,7 @@ uint32_t ParallelConnection::hash(const std::string& val) {
hashVal += (hashVal << 15);
return hashVal;
};
}
std::shared_ptr<ghoul::Event<>> ParallelConnection::connectionEvent() {
return _connectionEvent;