]> 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: bf03412 2c01ad3)
Merge branch 'master' into Mario/cts_checkpoint_speedup
authorMario <mario@smbclan.net>
Sat, 13 May 2017 03:41:42 +0000 (13:41 +1000)
committerMario <mario@smbclan.net>
Sat, 13 May 2017 03:41:42 +0000 (13:41 +1000)

Trivial merge