DarkRadiant: master 398f70fe

Author Committer Branch Timestamp Parent
greebo greebo master 20.06.2021 06:23 master 913de02e
Affected Issues  0005643: Three-Way Map Merge
Changeset 0005643: More conflict resolution logic.
mod - install/ui/mergecontroldialog.fbp Diff File
mod - install/ui/mergecontroldialog.xrc 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 - radiant/ui/merge/MergeControlDialog.h Diff File