Clément Brisset 5f07e3425d Merge pull request #4015 from PhilipRosedale/master ... Hydra hands deactivate when placed back on controller base		2014-12-30 12:04:16 -08:00
..
external
resources	removing shaders from resource	2014-12-25 20:05:00 -08:00
src	Merge pull request #4015 from PhilipRosedale/master	2014-12-30 12:04:16 -08:00
ui
CMakeLists.txt	merging with upstream master and origin temp0	2014-12-22 10:38:11 -08:00
interface.icns
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in