]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into martin-t/uncrustify
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 23 Sep 2017 16:03:48 +0000 (18:03 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 23 Sep 2017 16:03:48 +0000 (18:03 +0200)
commit598e7bb7bad2d90db6916173e94af74d1ad4bc73
tree8a7182d29bab3d64a899ad835681ee66882225b1
parent754fdeaa07b0349935b85a3bff92da9c01fc2aed
parentc7b5e9ebbb5d0c185c1da8301ce5a97f1c55cbdc
Merge branch 'master' into martin-t/uncrustify
qcsrc/client/hud/panel/weapons.qc
qcsrc/common/weapons/all.qc
qcsrc/common/weapons/weapon/crylink.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/scores.qc