David Cernat 3136a12051 Resolve conflicts in pull request #75 ... # Conflicts: # CMakeLists.txt # apps/openmw/CMakeLists.txt		2016-10-14 18:34:17 +03:00
..
model	OpenMW-CS: Recognize special faction ID "FFFF" (no faction) during topic info verification (Fixes #3564)	2016-10-11 19:36:44 +02:00
view	Disable OSG 3.5.5 thread affinity setting in the scenewidget due to the interference with QT threads	2016-10-10 18:23:06 +02: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