| Author |
Committer |
Branch |
Timestamp |
Parent |
| greebo |
greebo |
master |
03.07.2021 04:35 |
master 9f8ca637 |
|
|
Affected Issues |
0005643: Three-Way Map Merge |
|
|
Changeset |
0005643: Move lots of scene-related algorithm to scene/merge/MergeLib.h. Start adding a way to resolve entity conflicts by keeping both versions. |
| mod - install/ui/mergecontroldialog.fbp |
Diff
File |
| mod - install/ui/mergecontroldialog.xrc |
Diff
File |
| add - libs/scene/merge/MergeLib.h |
Diff
File |
| mod - radiant/ui/merge/MergeControlDialog.cpp |
Diff
File |
| mod - radiant/ui/merge/MergeControlDialog.h |
Diff
File |
| mod - radiantcore/map/MergeActionNode.h |
Diff
File |
| mod - tools/msvc/scenelib.vcxproj |
Diff
File |
| mod - tools/msvc/scenelib.vcxproj.filters |
Diff
File |
