# Conflicts: # Engine/source/platform/types.visualc.h # Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript # Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/terrain.tscript # Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript # Templates/BaseGame/game/tools/gui/scriptEditorDlg.ed.gui