scrawl ac0c1ea986 Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation ... Conflicts: apps/openmw/mwgui/dialogue.cpp		2012-09-27 08:47:47 +02:00
..
mwbase	Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation	2012-09-27 08:47:47 +02:00
mwclass	fixing some unrelated warnings	2012-09-23 19:36:37 +02:00
mwdialogue	Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation	2012-09-27 08:47:47 +02:00
mwgui	Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation	2012-09-27 08:47:47 +02:00
mwinput
mwmechanics	per NPC ID interaction tracking	2012-09-25 10:48:57 +02:00
mwrender	oops	2012-09-25 21:49:34 +02:00
mwscript	Merge branch 'master' into next	2012-09-22 20:48:55 +02:00
mwsound
mwworld	Merge remote-tracking branch 'scrawl/book_skillgain' into next	2012-09-26 20:35:48 +02:00
CMakeLists.txt	Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation	2012-09-27 08:47:47 +02:00
config.hpp.cmake
doc.hpp
engine.cpp
engine.hpp
main.cpp