]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/spawn_weapons
authorSamual <samual@xonotic.org>
Sun, 29 Jul 2012 04:36:31 +0000 (00:36 -0400)
committerSamual <samual@xonotic.org>
Sun, 29 Jul 2012 04:36:31 +0000 (00:36 -0400)
commite346b3e5361253e398a83298de080b85f941b9ce
treee22274afb896d6746f15b42650b63c0181417c60
parent539b0832480a43bb15841481754af3913501b7f3
parentd7b812c1948308092310e20f75a1b8d434e7b5f9
Merge remote-tracking branch 'origin/master' into samual/spawn_weapons
qcsrc/server/progs.src