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
David Cernat 38247ff086 Merge pull request #303 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwbase/dialoguemanager.hpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
#	apps/openmw/mwgui/container.cpp
#	apps/openmw/mwgui/windowmanagerimp.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
7 years ago
..
model Merge remote-tracking branch 'aesylwinn/landrecords' 7 years ago
view Merge remote-tracking branch 'aesylwinn/landrecords' 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 VFS changes, one VFS and resource system per document. 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