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-tes3coop/apps/opencs
scrawl b8e11cf197 Merge commit 'pull/upstream/678' into HEAD
Conflicts:
	apps/esmtool/record.cpp
	apps/opencs/model/doc/savingstages.cpp
	apps/opencs/model/world/land.cpp
	apps/opencs/model/world/land.hpp
	apps/opencs/model/world/landtexture.cpp
	apps/openmw/mwworld/store.cpp
	components/esm/loadland.cpp
	components/esm/loadland.hpp
9 years ago
..
model Merge commit 'pull/upstream/678' into HEAD 9 years ago
view changed instance selection model (primary selects, secondary toggles selection) 9 years ago
CMakeLists.txt basic cell arrow rendering (shape is a placeholder) 9 years ago
editor.cpp Merge branch 'mergetool' 9 years ago
editor.hpp added UI for merge tool (merge tool itself is still missing) 10 years ago
main.cpp Remove empty line at the beginning of files 10 years ago