]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/weapons/all.inc
Merge branch 'master' into martin-t/okc
authorMartin Taibr <taibr.martin@gmail.com>
Fri, 25 Aug 2017 14:49:37 +0000 (16:49 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 25 Aug 2017 14:49:37 +0000 (16:49 +0200)
commit3e8e73d5c867c2833409e33782d91c45fa0769eb
tree865268fde58e6a338e057aca145a5ab38cc205aa
parent9fb12c09ec824e8d4a51b821bc82567d3446fd5c
parent3412a9d342768ebdf8a459c1287c5c89579aaa6d
Merge branch 'master' into martin-t/okc