David Cernat fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts ...

# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/main.cpp

2017-06-18 18:16:10 +03:00

..

model

purge unnecessary imports

2017-06-09 19:08:53 +02:00

view

purge unnecessary imports

2017-06-09 19:08:53 +02:00

CMakeLists.txt

Move context menu code to PageBase

2017-05-11 19:46:51 +12:00

editor.cpp

…

editor.hpp

convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis

2017-06-09 16:49:25 +02:00

main.cpp

[macOS] Move all configs & resources into app bundles

2016-11-23 22:32:54 +01:00

Networking.cpp

…