]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Sat, 18 Mar 2017 16:14:24 +0000 (19:14 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 18 Mar 2017 16:14:24 +0000 (19:14 +0300)
commitf1df983bc7b50b40cab24091b8d3b01200b61223
treecd6399213f76189fa8b822b6905cb639ffae169c
parenta75cf30e9d196c9289b87640c2cca6ae76dc9dc3
parent28d902eb626eef4ab7c484ce2eb78e80ca0e2d3f
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master