]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'Lyberta/Survival' into Lyberta/master Lyberta/master
authorLyberta <lyberta@lyberta.net>
Wed, 22 Aug 2018 10:37:22 +0000 (13:37 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 22 Aug 2018 10:37:22 +0000 (13:37 +0300)
1  2 
qcsrc/common/items/item.qh
qcsrc/common/items/item/powerup.qh
qcsrc/common/mutators/mutator/waypoints/all.inc
qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
qcsrc/common/physics/player.qh

Simple merge
Simple merge
Simple merge