]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into martin-t/okc
authorMartin Taibr <taibr.martin@gmail.com>
Thu, 10 Aug 2017 22:43:53 +0000 (00:43 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Thu, 10 Aug 2017 22:43:53 +0000 (00:43 +0200)
commit2e6170f68128fcb440c35065ceef95d62a9735c2
treea5c636c90cdc0dfba99492f8cd3da25fc7428273
parent5f964d1c1c47777cf4b703f9b2f4061fbb329423
parentea21cf9661f922f64dd6cc698f3aa717bb70c3ab
Merge branch 'master' into martin-t/okc
qcsrc/common/mutators/mutator/dodging/sv_dodging.qc
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/t_items.qc
qcsrc/server/weapons/tracing.qc