| Author |
Committer |
Branch |
Timestamp |
Parent |
| greebo |
greebo |
master |
19.06.2021 06:08 |
master 5c8141c0 |
|
|
Affected Issues |
0005643: Three-Way Map Merge |
|
|
Changeset |
0005643: Expose conflict resolution action interface |
| 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 - radiant/ui/einspector/EntityInspector.cpp |
Diff
File |
| mod - radiant/ui/merge/MergeControlDialog.cpp |
Diff
File |
| mod - test/MapMerging.cpp |
Diff
File |
