]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'martin-t/kh' into martin-t/master2
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 26 Aug 2019 18:30:24 +0000 (20:30 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 26 Aug 2019 18:30:24 +0000 (20:30 +0200)
commit45724cf86a9a34bae6f39c4ada945e6ffd5c73ec
tree46f5ac5b7dac2c70fc9d6219ce80d4dd745f86ab
parentbee32c72c87c66ede25a9746bd957c2739132e81
parentdea08327b099f34d42f2da3ea212283fa52b5eea
Merge branch 'martin-t/kh' into martin-t/master2
qcsrc/client/view.qc
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc
qcsrc/common/mutators/mutator/dodging/sv_dodging.qc
qcsrc/server/miscfunctions.qc