]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/items/item/ammo.qc
Merge branch 'master' into Lyberta/RandomItems
authorLyberta <lyberta@lyberta.net>
Thu, 9 Nov 2017 16:32:18 +0000 (19:32 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 9 Nov 2017 16:32:18 +0000 (19:32 +0300)
commit7aaff08fbaad9424651ec31c82f8a5d78e5ec1e1
treec14e3a28cfc6c780806ddb96fd72ca95c43e6e8e
parentc05834ed15898e5a2cdc8b9bf490858401ce0290
parent8ddb07fc53abfac1eb67c03964594af963e8732e
Merge branch 'master' into Lyberta/RandomItems
qcsrc/server/compat/quake3.qc