Marc Zinnschlag 2c70a93553 Merge branch 'master' into potions ... Conflicts: apps/openmw/mwclass/npc.cpp apps/openmw/mwclass/npc.hpp		2012-07-17 10:32:18 +02:00
..
esmtool	Issue #314: Moved ingredients and potions to a different type of record list	2012-07-13 13:08:48 +02:00
launcher	Second try: added aspect ratios to the resolution combobox	2012-06-29 19:13:12 +02:00
mwiniimporter	fixed some cppcheck issues	2012-06-06 20:29:30 +02:00
openmw	Merge branch 'master' into potions	2012-07-17 10:32:18 +02:00
doc.hpp	first set of additional doxygen comments	2010-09-25 15:03:53 +02:00