History

Merge fixes, OSX compile fixes

Bradley Austin Davis committed 11 years ago

Commit 408bb081 parent 114ab9e8 files · +47 −19Browse files

Showing the changes to interface/src/scripting/ControllerScriptingInterface.cpp (1 of 8 files). Show all

Unified · Split

interface/src/scripting/ControllerScriptingInterface.cpp+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
19#include "ControllerScriptingInterface.h"19#include "ControllerScriptingInterface.h"
20 20
21// TODO: this needs to be removed, as well as any related controller-specific information21// TODO: this needs to be removed, as well as any related controller-specific information
22#include <input-plugins\SixenseManager.h>22#include <input-plugins/SixenseManager.h>
23 23
24 24
25ControllerScriptingInterface::ControllerScriptingInterface() :25ControllerScriptingInterface::ControllerScriptingInterface() :