Andrew Meadows 59f6988e56 Merge pull request #5465 from SamGondelman/connexionFixes ... Trying to fix/clean up 3DConnexion stuff		2015-08-05 11:16:34 -07:00
..
external	windows finds framework	2015-07-31 16:27:10 -07:00
icon
resources	Use single file robot model as fallback for full avatar models	2015-07-29 19:34:05 -07:00
src	Merge pull request #5465 from SamGondelman/connexionFixes	2015-08-05 11:16:34 -07:00
ui	Rename and refactor eye deflection slider	2015-07-16 14:05:34 -07:00
CMakeLists.txt	merge from master	2015-08-03 16:27:45 -07:00
interface_en.ts
InterfaceVersion.h.in