]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/WaypointIcons
authorLyberta <lyberta@lyberta.net>
Mon, 16 Jul 2018 12:23:59 +0000 (15:23 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 16 Jul 2018 12:23:59 +0000 (15:23 +0300)
commit1bc702dfdee634f6d04d1fd231e4ee9e4da4da62
tree6ac394db2d4ef5d7085ddbf34e055b925dedf05b
parent9d3e8d70a1e35074d387efa571555197ac784973
parentaa1c87cd3f79ddaf4e45ebf9428293cfdf2d6733
Merge branch 'master' into Lyberta/WaypointIcons
qcsrc/common/items/item.qh
qcsrc/common/items/item/armor.qh
qcsrc/common/items/item/health.qh
qcsrc/common/items/item/jetpack.qh
qcsrc/common/mutators/mutator/instagib/items.qh
qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc