Dante Ruiz e0f19944bc Merge branch 'master' of github.com:highfidelity/hifi into snapshot-fix		2017-04-10 20:58:46 +01:00
..
external
i18n
icon
resources	Merge branch 'master' of github.com:highfidelity/hifi into snapshot-fix	2017-04-10 20:58:46 +01:00
src	Merge pull request #10169 from hyperlogic/feature/absolute-default-joints-in-object-frame	2017-04-10 12:55:02 -07:00
ui	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
CMakeLists.txt	Creating new avatar rendering library, prepping for crowd rendering project	2017-04-10 10:55:04 -07:00
interface.exe.manifest