DarkRadiant: master 24cf0227
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| greebo | greebo | master | 20.06.2021 07:38 | master 398f70fe |
| Affected Issues | 0005643: Three-Way Map Merge | |||
| Changeset | 0005643: More conflict UI handling, focusing on functionality only. | |||
| mod - install/ui/mergecontroldialog.fbp | Diff File | |||
| mod - install/ui/mergecontroldialog.xrc | Diff File | |||
| mod - radiant/ui/merge/MergeControlDialog.cpp | Diff File | |||
| mod - radiantcore/map/Map.cpp | Diff File | |||
| mod - radiantcore/map/MergeActionNode.cpp | Diff File | |||
