Dante Ruiz 25b1bb0633 adjusted values		2017-05-16 23:34:46 +01:00
..
external
i18n
icon
resources	adjusted values	2017-05-16 23:34:46 +01:00
src	Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter	2017-05-16 00:15:18 +01: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