Commit graph

3 commits

Author SHA1 Message Date
Marc Zinnschlag
6469933ce8 Merge branch 'master' into alchemy
Conflicts:
	apps/openmw/mwgui/alchemywindow.cpp
2012-10-02 09:30:49 +02:00
Marc Zinnschlag
42f02f3ccd Issue #61: Re-implemented tool selection in Alchemy class 2012-09-30 18:54:20 +02:00
Marc Zinnschlag
c6fd864a76 Issue #61: Forgot to add some files 2012-09-29 10:02:46 +02:00