David Cernat 47ebd24b4a Merge pull request #79 from OpenMW/master while resolving conflicts ... # Conflicts: # .travis.yml # apps/openmw/mwinput/inputmanagerimp.cpp		2016-10-24 09:18:21 +03:00
..
model	Fix shadowing warnings	2016-10-16 01:34:54 +09:00
view	Fix shadowing warnings	2016-10-16 01:34:54 +09:00
CMakeLists.txt	Fix globals not being initialized with a valid type.	2016-08-09 00:17:41 -04:00
editor.cpp	Read fallback settings in OpenCS	2016-01-11 23:10:16 +01:00
editor.hpp	removed old user settings system	2015-12-15 12:49:55 +01:00
main.cpp	Syncing inventory, animations, position, 8 key attributes	2016-07-07 23:50:48 +08:00
Networking.cpp	Add OpenMW-mp target	2016-01-04 20:15:55 +08:00