Commit graph

52 commits

Author SHA1 Message Date
scrawl
9612ce595b Merge branch 'master' of https://github.com/zinnschlag/openmw into terraincollision
Conflicts:
	CMakeLists.txt
2012-03-13 17:09:50 +01:00
Nikolay Kasyanov
b4343431c6 Merged openengine into openmw 2012-03-11 18:16:29 +04:00