scrawl 6ee4e8fb5a Merge branch 'itemstacking' into inventoryGUI ... Conflicts: apps/openmw/mwclass/armor.hpp apps/openmw/mwclass/clothing.hpp apps/openmw/mwclass/weapon.hpp apps/openmw/mwworld/class.hpp		2012-05-12 18:32:06 +02:00
..
mwbase	fixed exception handling during subsystem setup	2012-05-04 17:20:57 +02:00
mwclass	Merge branch 'itemstacking' into inventoryGUI	2012-05-12 18:32:06 +02:00
mwdialogue	Merge branch 'master' of https://github.com/zinnschlag/openmw into gui	2012-05-04 07:34:38 +02:00
mwgui	small fix	2012-05-12 18:28:14 +02:00
mwinput	Merge branch 'master' of https://github.com/zinnschlag/openmw into gui	2012-05-04 07:34:38 +02:00
mwmechanics	Merge branch 'master' into physicsaedra2 & fix warnings	2012-04-30 18:46:51 +02:00
mwrender	Finished merging.	2012-05-11 11:52:07 +02:00
mwscript	Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips	2012-04-24 02:02:03 +02:00
mwsound	Add voices to the chargen class questions	2012-05-01 20:30:31 -07:00
mwworld	Merge branch 'itemstacking' into inventoryGUI	2012-05-12 18:32:06 +02:00
CMakeLists.txt	Merge branch 'master' into inventoryGUI	2012-05-11 16:41:27 +02:00
config.hpp.cmake	another minor correction (fixing the previous one)	2011-07-08 16:16:06 +02:00
doc.hpp	first set of additional doxygen comments	2010-09-25 15:03:53 +02:00
engine.cpp	Merge remote branch 'scrawl/gui'	2012-05-10 12:08:49 +02:00
engine.hpp	change daedric font to .zip resource	2012-05-09 02:16:10 +02:00
main.cpp	removed --report-focus which is now useless	2012-04-19 01:16:41 +02:00