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.

David Cernat 3a9e5e3a7b Merge pull request #319 from OpenMW/master while resolving conflicts ... # Conflicts: # apps/openmw/mwworld/worldimp.hpp		7 years ago
..
model	Merge remote-tracking branch 'aesylwinn/forceNewProject'	7 years ago
view	Fix region colors	7 years ago
CMakeLists.txt	Merge remote-tracking branch 'aesylwinn/landrecords'	7 years ago
Networking.cpp	Add OpenMW-mp target	9 years ago
editor.cpp	Do the same for the CS	7 years ago
editor.hpp	VFS changes, one VFS and resource system per document.	7 years ago
main.cpp	[macOS] Move all configs & resources into app bundles	8 years ago