]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 24b0616 5d8362f)
Merge branch 'Mario/monsters'
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 26 Nov 2014 10:43:59 +0000 (11:43 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 26 Nov 2014 10:43:59 +0000 (11:43 +0100)

Trivial merge