]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/samual/lightning_gun' into samual/weapons
authorSamual Lenks <samual@xonotic.org>
Mon, 10 Jun 2013 01:46:57 +0000 (21:46 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 10 Jun 2013 01:46:57 +0000 (21:46 -0400)
commit316b99cb8eadb3f99c357ffb628002f50f89484f
treeff0b28366de9d0dd1557f84b9ac3c10b98a00047
parent72646dce0aa577090f682ed30c94509f9e3d8046
parent9226d2a17f8329b6964cf4be5c5433e7e763c240
Merge remote-tracking branch 'origin/samual/lightning_gun' into samual/weapons