]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'martin-t/okc2' into martin-t/okc3
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 27 Aug 2017 16:58:01 +0000 (18:58 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 27 Aug 2017 16:58:01 +0000 (18:58 +0200)
commit05ea4a52afe3d18b6978314cdbd96f9fadc52074
tree9948fe6eb4fb06662122abda6cd44a8de6331b02
parent5f03fdda245511e8f6239434b9b8f5fc62cdfae0
parentb2d3d16a9a3e5df1c518ecd2fce0bfa741db190a
Merge branch 'martin-t/okc2' into martin-t/okc3
balance-overkill.cfg
qcsrc/server/g_damage.qc