Stanislav Bas 6162a46fbe Update to upstream/master. Resolve the merge conflict		2015-07-05 16:15:48 +03:00
..
doc	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-06-28 00:38:39 +02:00
filter	Silence -Wreorder warnings, and remove -Wno-reorder.	2015-05-21 22:46:44 -05:00
settings	Add the user setting for enabling the configuration of extended commands	2015-07-02 20:41:32 +03:00
tools	Merge remote-tracking branch 'cc9cii/master'	2015-06-25 14:06:22 +02:00
world	Fix a typo	2015-07-03 02:42:40 +02:00