DarkRadiant: master 359b5009

Author Committer Branch Timestamp Parent
greebo greebo master 2021-06-14 13:55:23 master 1a217b09
Affected Issues  0005643: Three-Way Map Merge
Changeset 0005643: Add skeleton class representing a three-way merge operation
mod - libs/scene/CMakeLists.txt Diff File
mod - libs/scene/merge/MergeOperation.h Diff File
add - libs/scene/merge/ThreeWayMergeOperation.cpp Diff File
add - libs/scene/merge/ThreeWayMergeOperation.h Diff File
mod - tools/msvc/scenelib.vcxproj Diff File
mod - tools/msvc/scenelib.vcxproj.filters Diff File