]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'maint' (early part)
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 20 Aug 2015 17:19:03 +0000 (19:19 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 20 Aug 2015 17:19:03 +0000 (19:19 +0200)
1  2 
qcsrc/server/mutators/mutator_instagib.qc
qcsrc/server/t_items.qc

Simple merge