David Rowe de49fefc61 Merge branch 'master' into 21602 ... # Conflicts: # libraries/shared/src/RegisteredMetaTypes.h		2017-11-25 17:06:36 +13:00
..
external
i18n
icon
resources	Merge pull request #11864 from zfox23/commerce_newHelpText	2017-11-22 12:53:16 -05:00
src	Merge branch 'master' into 21602	2017-11-25 17:06:36 +13:00
ui
CMakeLists.txt	Merge pull request #11612 from highfidelity/pointers	2017-10-20 13:53:52 -07:00
interface.exe.manifest