]> 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, 3 Sep 2017 19:13:43 +0000 (21:13 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 3 Sep 2017 19:13:43 +0000 (21:13 +0200)
commit2685e55bc4c47311b003f6ef4fc527aff2d189b3
treee929771023e36c730415be5a30e998696b0a12a2
parent04ae091566c0a6d1f50702eee7563fb8efb26504
parentc89e099b706d9c07b2ce49fd267c0f35f06f2146
Merge branch 'martin-t/okc2' into martin-t/okc3
qcsrc/server/g_damage.qc