1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 23:49:55 +00:00
openmw-tes3mp/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
2017-10-06 04:10:04 +03:00
..
model Merge remote-tracking branch 'aesylwinn/landrecords' 2017-10-03 13:32:02 +02:00
view Merge remote-tracking branch 'aesylwinn/landrecords' 2017-10-03 13:32:02 +02:00
CMakeLists.txt Merge remote-tracking branch 'aesylwinn/landrecords' 2017-10-03 13:32:02 +02:00
editor.cpp VFS changes, one VFS and resource system per document. 2017-08-21 22:31:19 -04:00
editor.hpp VFS changes, one VFS and resource system per document. 2017-08-21 22:31:19 -04:00
main.cpp [macOS] Move all configs & resources into app bundles 2016-11-23 22:32:54 +01:00
Networking.cpp Add OpenMW-mp target 2016-01-04 20:15:55 +08:00