DarkRadiant: master f159b4cd

Author Committer Branch Timestamp Parent
greebo greebo master 21.06.2021 04:57 master 6f5a0c5d
Affected Issues  0005643: Three-Way Map Merge
Changeset 0005643: Notify when there's nothing to merge. Display a description of every single merge action.
mod - include/imapmerge.h Diff File
mod - install/ui/mergecontroldialog.fbp Diff File
mod - install/ui/mergecontroldialog.xrc Diff File
mod - libs/scene/merge/MergeOperationBase.cpp Diff File
mod - libs/scene/merge/MergeOperationBase.h Diff File
mod - radiant/ui/einspector/EntityInspector.cpp Diff File
mod - radiant/ui/merge/MergeControlDialog.cpp Diff File
mod - radiantcore/map/Map.cpp Diff File