]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit67c148c785f03d94ae1a4085dc5feed30028c0b7
treedb8fc7d433e4ffd39a16b157a9e2d9c3af6bc33a
parentff024dad9985f1adf868547dbbcefdcaadbe9d1c
parentbe20a760ec82a9aada33a1fdb9e0de7dc31ada3b
Merge branch 'master' into terencehill/gameover_stuff
qcsrc/common/notifications/all.inc
qcsrc/server/player.qc
qcsrc/server/weapons/weaponsystem.qc