David Rowe 033b85a3a8 Merge branch 'master' into remove-deprecated-items ... # Conflicts: # scripts/system/libraries/entitySelectionTool.js		2018-02-13 09:42:40 +13: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 #12363 from zfox23/commerce_inspectionCertRedesign_v2	2018-02-09 15:51:46 -08:00
src	Merge branch 'master' into remove-deprecated-items	2018-02-13 09:42:40 +13:00
ui
CMakeLists.txt	Merge pull request #12205 from jherico/no_widgets	2018-02-05 15:32:54 -08:00
interface.exe.manifest