]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into martin-t/mg-solidpen
authorMartin Taibr <taibr.martin@gmail.com>
Thu, 29 Aug 2019 23:48:17 +0000 (01:48 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Thu, 29 Aug 2019 23:48:17 +0000 (01:48 +0200)
commitaf43b181a15f348a4de2045b716ebc7765ce8f9f
tree6ad8a8c642ab3c157debdfff80660c211917eaec
parent3ad07d4d8ecae45a69a554f975fd986bc3b99a88
parenteef8ad5e4970d0476e0d7c6e65a5c36e1bac2282
Merge branch 'master' into martin-t/mg-solidpen
bal-wep-xonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/defs.qh
qcsrc/server/weapons/tracing.qc
vehicles.cfg
xonotic-server.cfg