1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-17 02:42:45 +00:00
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
..
2012-04-04 20:06:31 +02:00