mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-01 16:29:43 -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-10-26 13:43:49 +02:00
parent 6d8ec8a7c6 a599516f2c
commit 157d91d631
129 changed files with 1658 additions and 888 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/interaction/keybindingmanager.cpp
+1 -1
View File
@@ -138,7 +138,7 @@ std::string KeyBindingManager::generateJson() const {
}
return jsonString;
}
}
scripting::LuaLibrary KeyBindingManager::luaLibrary() {
return {