]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e4ac65a b557753)
Merge branch 'Mario/monsters_broken' into 'master'
authorTimePath <andrew.hardaker1995@gmail.com>
Sat, 29 Aug 2015 12:24:32 +0000 (12:24 +0000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sat, 29 Aug 2015 12:24:32 +0000 (12:24 +0000)
Merge branch Mario/monsters_broken (L merge request)

Don't worry, it's not broken

See merge request !208


Trivial merge