Brad Davis ef2d71e576 Merge remote-tracking branch 'upstream/master' into HEAD ... Conflicts: libraries/input-plugins/src/input-plugins/SixenseManager.cpp		2015-10-27 09:41:58 -07:00
..
src/input-plugins	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-27 09:41:58 -07:00
CMakeLists.txt	Merging old and new controller interfaces	2015-10-14 15:16:54 -07:00