]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/WaypointIcons
authorLyberta <lyberta@lyberta.net>
Wed, 22 Aug 2018 10:35:30 +0000 (13:35 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 22 Aug 2018 10:35:30 +0000 (13:35 +0300)
commitf53ede36a1898c157e840c96ffac2534ab3c8e31
tree3c7021a16d43831679bd352caa563fc468a36c07
parent1bc702dfdee634f6d04d1fd231e4ee9e4da4da62
parenta34c7d612200ef8fe04cb9649061b2e4b6fc5703
Merge branch 'master' into Lyberta/WaypointIcons
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