]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Fri, 16 Dec 2011 12:56:46 +0000 (07:56 -0500)
committerSamual <samual@xonotic.org>
Fri, 16 Dec 2011 12:56:46 +0000 (07:56 -0500)
commit459d6603efe1acff27f2b78d6d144e5a8a005c41
treeb6aa49f99b88a0bf3fe7ae98bc1c23d753940514
parent7d2f90ca7c4c51aa8ab1ed4911000e656dbbaff8
parent3d1817a9f5354dbfa1cf799ee7f3a206dd0ed033
Merge remote-tracking branch 'origin/master' into samual/updatecommands
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/g_world.qc