Clément Brisset d18394f249 Merge pull request #8596 from huffman/feat/my-avatar-self-id ... Add ability to parent overlays to MyAvatar for use across servers		2016-10-05 12:03:01 -07:00
..
external
i18n
icon
resources	Merge pull request #8683 from jherico/oglplus_b_gone2	2016-10-05 09:59:42 -07:00
src	Merge pull request #8596 from huffman/feat/my-avatar-self-id	2016-10-05 12:03:01 -07:00
ui
CMakeLists.txt	Merge branch 'master' of https://github.com/highfidelity/hifi into low-latency-audio	2016-09-06 20:56:20 -07:00
interface.exe.manifest