]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into terencehill/gameover_stuff
authorterencehill <piuntn@gmail.com>
Fri, 16 Sep 2016 14:27:50 +0000 (16:27 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 16 Sep 2016 14:27:50 +0000 (16:27 +0200)
1  2 
qcsrc/common/notifications/all.inc
qcsrc/server/player.qc
qcsrc/server/weapons/weaponsystem.qc

Simple merge
Simple merge
Simple merge