Sam Gateau 523d57d948 Merge pull request #13162 from AndrewMeadows/avatar-collisions ... avatars collide again		2018-05-16 09:25:05 -07:00
..
compiledResources	Pre-merge cleanup	2018-01-14 19:48:12 -08:00
external	GLAD polish	2018-01-14 00:10:05 -08:00
i18n
icon
resources	Merge pull request #13158 from highfidelity/stable	2018-05-15 14:01:06 -07:00
src	Merge pull request #13162 from AndrewMeadows/avatar-collisions	2018-05-16 09:25:05 -07:00
ui
CMakeLists.txt	Include JSDoc Web pages in the install	2018-04-16 16:08:26 +12:00
interface.exe.manifest