scrawl 469d2afffa Merge branch 'master' of https://github.com/OpenMW/openmw ... Conflicts: apps/openmw/mwgui/levelupdialog.cpp		2014-07-24 02:33:46 +02:00
..
doc	added resources manager	2014-07-04 12:46:57 +02:00
filter	injected new class IdTableBase between QAbstractItemModel and IdTable	2014-07-04 13:25:56 +02:00
settings
tools	Make ESM::Faction skills optional (Fixes #1508)	2014-06-16 02:52:16 +02:00
world	Merge branch 'master' of https://github.com/OpenMW/openmw	2014-07-24 02:33:46 +02:00