]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/spawn_weapons
authorSamual Lenks <samual@xonotic.org>
Thu, 26 Jul 2012 04:44:47 +0000 (00:44 -0400)
committerSamual Lenks <samual@xonotic.org>
Thu, 26 Jul 2012 04:44:47 +0000 (00:44 -0400)
commit5526892934ab6298ceadc373fa24771a8e26dab6
tree16245b3a6057ba099aff8b3d0fa4eeb5c012271e
parentbc670765fe8263c7366ad8cd9b32eabfa39eeda7
parent9c6010e7040b600691285a01a21e2df1d0c4be03
Merge remote-tracking branch 'origin/master' into samual/spawn_weapons