NeetBhagat ead0d42cf3 Merge branch 'master' into 21369 ... # Conflicts: # libraries/gl/src/gl/OffscreenQmlSurface.cpp # libraries/gl/src/gl/OffscreenQmlSurface.h		2017-06-07 15:47:19 +05:30
..
external
i18n
icon
resources	Merge branch 'master' into 21369	2017-06-07 15:47:19 +05:30
src	Merge branch 'master' into 21369	2017-06-07 15:47:19 +05:30
ui
CMakeLists.txt	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
interface.exe.manifest