| Author |
Committer |
Branch |
Timestamp |
Parent |
| greebo |
greebo |
master |
19.06.2021 16:17 |
master 35770902 |
|
|
Affected Issues |
0005643: Three-Way Map Merge |
|
|
Changeset |
0005643: Working on EntityInspector accepting and rejecting conflicting key/value changes and the way the associated nodes are rendered. |
| mod - include/imapmerge.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 - radiantcore/map/MergeActionNode.cpp |
Diff
File |
| mod - radiantcore/map/MergeActionNode.h |
Diff
File |
