Dante Ruiz a45bea2c90 fixed merge conflicts		2017-05-27 00:57:09 +01:00
..
external
i18n
icon
resources	fixed merge conflicts	2017-05-27 00:57:09 +01:00
src	Merge branch 'master' of github.com:highfidelity/hifi into arm-pucks	2017-05-26 17:03:05 +01:00
ui
CMakeLists.txt	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
interface.exe.manifest