]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/TeamplayOverhaul2
authorLyberta <lyberta@lyberta.net>
Sun, 29 Jul 2018 17:38:31 +0000 (20:38 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 29 Jul 2018 17:38:31 +0000 (20:38 +0300)
commit8f4e38f34794f44d2ea707ca4b836d88b0a39c3d
tree9e99b21d8cbfda4bb3b1f6e4fbd4021419c8a070
parentf943da12a4200b5093936a9644a6f67efa68bb97
parent2fe686c435959d46b3a215ea7b73e8609dfe4f08
Merge branch 'master' into Lyberta/TeamplayOverhaul2
qcsrc/server/client.qc
qcsrc/server/teamplay.qc