You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
openmw-tes3mp/apps/opencs
Marc Zinnschlag 904ad94952 added merge operation (doesn't do anything yet) 10 years ago
..
model added merge operation (doesn't do anything yet) 10 years ago
view added merge operation (doesn't do anything yet) 10 years ago
CMakeLists.txt added merge operation (doesn't do anything yet) 10 years ago
editor.cpp added UI for merge tool (merge tool itself is still missing) 10 years ago
editor.hpp added UI for merge tool (merge tool itself is still missing) 10 years ago
main.cpp Merge branch 'master' of https://github.com/OpenMW/openmw into osg 10 years ago