]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/min_spec_time
authorterencehill <piuntn@gmail.com>
Wed, 30 May 2018 12:44:23 +0000 (14:44 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 30 May 2018 12:44:23 +0000 (14:44 +0200)
commitbc50c2d7ca3e0a44ed1712400ef8e170e6df8210
tree7b01fd77ab13d2decd3e37afba8c0c5bb854e2f3
parent63b6be263ca5233c13a047ed20950494b53602ba
parente95e817d04d9233dd9d3ce3f70f09de8379ed443
Merge branch 'master' into terencehill/min_spec_time
qcsrc/server/client.qc
qcsrc/server/client.qh
qcsrc/server/mutators/events.qh