overte/libraries/shared
David Rowe 7445d73857 Merge branch 'master' into M21222
# Conflicts:
#	libraries/avatars/src/AvatarData.h
2019-03-13 16:14:14 +13:00
..
src Merge branch 'master' into M21222 2019-03-13 16:14:14 +13:00
CMakeLists.txt Merge pull request #12205 from jherico/no_widgets 2018-02-05 15:32:54 -08:00