]> 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: 724a41f f215024)
Merge branch 'master' into morphed/hagar
authorMario <mario@smbclan.net>
Mon, 15 Feb 2016 01:15:52 +0000 (11:15 +1000)
committerMario <mario@smbclan.net>
Mon, 15 Feb 2016 01:15:52 +0000 (11:15 +1000)

Trivial merge