]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Thu, 22 Dec 2011 23:08:06 +0000 (18:08 -0500)
committerSamual <samual@xonotic.org>
Thu, 22 Dec 2011 23:08:06 +0000 (18:08 -0500)
commitbcb30bf31a58942eb89829a72b1e76661de7920c
treea0e89324c2ca487dfc736d7c2ba2480d3d2a364e
parent1f1c714c231334ca941e029e7ab2094fff25b476
parentb7ee6d6b8bb89cad86c1498abc590b1b838ee5bf
Merge remote branch 'origin/master' into samual/updatecommands

Conflicts:
defaultXonotic.cfg
defaultXonotic.cfg
qcsrc/server/g_world.qc