]> 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: 35d6275 1729cb8)
Merge branch 'master' into Mario/speed_var
authorMario <mario@smbclan.net>
Mon, 18 Mar 2019 07:07:49 +0000 (17:07 +1000)
committerMario <mario@smbclan.net>
Mon, 18 Mar 2019 07:07:49 +0000 (17:07 +1000)

Trivial merge