Merge branch 'master' of git@github.com:singularity-viewer/SingularityViewer.git

This commit is contained in:
Shyotl
2014-09-07 15:46:05 -05:00
235 changed files with 2743 additions and 2127 deletions

View File

@@ -881,9 +881,6 @@ bool LLAppViewer::init()
gGLManager.getGLInfo(gDebugInfo);
gGLManager.printGLInfoString();
//load key settings
bind_keyboard_functions();
// Load Default bindings
load_default_bindings(gSavedSettings.getBOOL("LiruUseZQSDKeys"));