]> 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: 63ab067 595b8c7)
Merge branch 'Mario/cts_checkpoint_speedup' into 'master'
authorMario <zacjardine@y7mail.com>
Tue, 16 May 2017 22:17:10 +0000 (22:17 +0000)
committerMario <zacjardine@y7mail.com>
Tue, 16 May 2017 22:17:10 +0000 (22:17 +0000)
Merge branch Mario/cts_checkpoint_speedup (S merge request)

See merge request !440


Trivial merge