Commit graph

52 commits

Author SHA1 Message Date
scrawl
1c0dd3ccc5 some editing code 2012-10-03 15:06:54 +02:00
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