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 fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts ... # Conflicts: # .travis.yml # CMakeLists.txt # apps/openmw/main.cpp		7 years ago
..
model	purge unnecessary imports	7 years ago
view	purge unnecessary imports	7 years ago
CMakeLists.txt	Move context menu code to PageBase	7 years ago
Networking.cpp	Add OpenMW-mp target	8 years ago
editor.cpp	Read fallback settings in OpenCS	8 years ago
editor.hpp	convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis	7 years ago
main.cpp	[macOS] Move all configs & resources into app bundles	8 years ago