DarkRadiant: master a8e3607f
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| greebo | greebo | master | 20.06.2021 16:32 | master 31ff662f |
| Affected Issues | 0005643: Three-Way Map Merge | |||
| Changeset | 0005643: Move code to deactivate the conflict actions (and reject the source change) on removal from scene to the nodes. | |||
| mod - radiant/ui/merge/MergeControlDialog.cpp | Diff File | |||
| mod - radiantcore/map/MergeActionNode.cpp | Diff File | |||
| mod - radiantcore/map/MergeActionNode.h | Diff File | |||
