]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41e3520 638035e)
Merge branch 'master' into Mario/entrap_nade
authorMario <mario@smbclan.net>
Sun, 12 Jun 2016 18:19:25 +0000 (04:19 +1000)
committerMario <mario@smbclan.net>
Sun, 12 Jun 2016 18:19:25 +0000 (04:19 +1000)

Trivial merge