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
..
reclists.hpp	Changed standard C lib includes to C++ format	2012-07-17 09:44:24 +02:00
store.cpp
store.hpp	Issue #314: Moved ingredients and potions to a different type of record list	2012-07-13 13:08:48 +02:00