David Cernat 436548413e Resolve conflicts in pull request #39 ... # Conflicts: # CMakeLists.txt		2016-08-18 15:10:52 +03:00
..
model	Change free axis rotation.	2016-08-15 15:07:43 -04:00
view	Merge remote-tracking branch 'aesylwinn/InstanceRotateAndScale'	2016-08-18 09:13:43 +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