DarkRadiant: master 16cd7ea1

Author Committer Branch Timestamp Parent
greebo greebo master 19.06.2021 06:44 master 2d21b62a
Affected Issues  0005643: Three-Way Map Merge
Changeset 0005643: More work on visualising conflicts, add some handling code to EntityInspector.
mod - include/imapmerge.h Diff File
mod - install/ui/mergecontroldialog.fbp Diff File
mod - install/ui/mergecontroldialog.xrc Diff File
mod - libs/scene/merge/MergeAction.h Diff File
mod - libs/wxutil/dataview/TreeViewItemStyle.h Diff File
mod - radiant/ui/einspector/EntityInspector.cpp Diff File
mod - radiant/ui/einspector/EntityInspector.h Diff File
mod - radiant/ui/merge/MergeControlDialog.cpp Diff File
mod - test/MapMerging.cpp Diff File