]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Mon, 4 Dec 2017 18:29:04 +0000 (21:29 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 4 Dec 2017 18:29:04 +0000 (21:29 +0300)
commit1be4f118b306ece2942bd35e6dc9af73aedb2eaa
tree1c89015db0ad258a3e0b78bbca2c9e8aff9f1487
parent26e5056cd9203b3685b63b701ac933e8bb8901db
parent69ebfd5e7f96727f0e5d628085e686b81da8454a
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master