]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Sun, 25 Dec 2011 16:21:20 +0000 (11:21 -0500)
committerSamual <samual@xonotic.org>
Sun, 25 Dec 2011 16:21:20 +0000 (11:21 -0500)
commit1d29897965eea7d8713a780fe01d5fcf34fc0b51
tree51506f5f49febd016ff867eaac70b51e1514a3f8
parentea5a602ca6229b9c26dea42e21cedcd5feffc5f3
parenta6142d76076d281d587b3357f9a3355e73c86f16
Merge remote branch 'origin/master' into samual/updatecommands
qcsrc/server/g_world.qc