mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-31 14:15:32 +00:00
Code Issues Releases Wiki Activity
13870 commits 38 branches 54 tags 122 MiB
Commit graph

1 commit

Author SHA1 Message Date
Marc Zinnschlag
ef1e01639e added UI for merge tool (merge tool itself is still missing) 
(cherry picked from commit b83f9445a9)

Conflicts:
	apps/opencs/editor.cpp
	apps/opencs/editor.hpp
 2015-11-01 13:22:42 +11:00