]> 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: 469a365 1995b0f)
Merge branch 'Lyberta/f1time' into 'master'
authorMario <zacjardine@y7mail.com>
Thu, 1 Jun 2017 17:22:55 +0000 (17:22 +0000)
committerMario <zacjardine@y7mail.com>
Thu, 1 Jun 2017 17:22:55 +0000 (17:22 +0000)
Made f1time be handled on the server too.

See merge request !444


Trivial merge