]> 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>
Tue, 28 Aug 2012 16:02:34 +0000 (12:02 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 28 Aug 2012 16:02:34 +0000 (12:02 -0400)
commit4399a38273cbc1a582a08d9305b3066b570e4ffa
treec996af8eb3b15dee1a8ecb73594809bce981d5c1
parentf0e4cbdeab56f82814323397131337b5cbc312e0
parentfb44eb140ca8c815e2324c40e755778a0197e117
Merge remote-tracking branch 'origin/master' into samual/spawn_weapons