| Author |
Committer |
Branch |
Timestamp |
Parent |
| greebo |
greebo |
master |
14.06.2021 15:30 |
master 9d08ce23 |
|
|
Affected Issues |
0005643: Three-Way Map Merge |
|
|
Changeset |
0005643: Introduce MergeOperationBase class to host the shared code |
| mod - libs/scene/merge/MergeOperation.cpp |
Diff
File |
| mod - libs/scene/merge/MergeOperation.h |
Diff
File |
| add - libs/scene/merge/MergeOperationBase.cpp |
Diff
File |
| add - libs/scene/merge/MergeOperationBase.h |
Diff
File |
| mod - libs/scene/merge/ThreeWayMergeOperation.cpp |
Diff
File |
| mod - libs/scene/merge/ThreeWayMergeOperation.h |
Diff
File |
| mod - tools/msvc/scenelib.vcxproj |
Diff
File |
| mod - tools/msvc/scenelib.vcxproj.filters |
Diff
File |
