Anthony Thibault 84901ba94b Merge pull request #10542 from druiz17/arm-pucks ... Added pucks calibration for upper arm/shoulders		2017-05-26 11:17:15 -07:00
..
external
i18n
icon
resources	fixed merge conflict	2017-05-24 19:35:41 +01:00
src	Merge pull request #10542 from druiz17/arm-pucks	2017-05-26 11:17:15 -07:00
ui	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
CMakeLists.txt	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
interface.exe.manifest