]> 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: 930ef45 97b5964)
Merge branch 'master' into Mario/bulldozer
authorMario <mario@smbclan.net>
Sun, 15 Nov 2015 16:34:03 +0000 (02:34 +1000)
committerMario <mario@smbclan.net>
Sun, 15 Nov 2015 16:34:03 +0000 (02:34 +1000)

Trivial merge