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

..

bsa

…

compiler

…

esm

Merge branch 'master' into potions

2012-07-17 10:32:18 +02:00

esm_store

Merge branch 'master' into potions

2012-07-17 10:32:18 +02:00

file_finder

…

files

…

interpreter

…

misc

…

nif

…

nifbullet

…

nifogre

…

nifoverrides

…

settings

…

terrain

…

to_utf8

…

CMakeLists.txt

…

doc.hpp

…