David Cernat 4468e6ec4a Merge pull request #280 from OpenMW/master while resolving conflicts ... # Conflicts: # .gitignore # apps/openmw/mwmechanics/actors.hpp # apps/openmw/mwmechanics/mechanicsmanagerimp.cpp		2017-08-31 15:14:13 +03:00
..
model	Fix wrong folder name	2017-08-23 00:02:02 -04:00
view	Implement releaseGLObjects for cached resources	2017-08-26 19:29:12 +00:00
CMakeLists.txt	Move context menu code to PageBase	2017-05-11 19:46:51 +12: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