]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into tzork/csqc-items
authorJakob MG <jakob_mg@hotmail.com>
Fri, 1 Jun 2012 20:10:43 +0000 (22:10 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Fri, 1 Jun 2012 20:10:43 +0000 (22:10 +0200)
commit5113ce137473f7d4ffd4b085d79be93858aefece
tree1f20aed291f7b45de89993816bc5750af9b17652
parentf2756ec48ef7d5c2edebc9bd4885cc753060b2e6
parenta5a16f5c871c6fe14a6df9aa6883377941d37907
Merge remote-tracking branch 'origin/master' into tzork/csqc-items
defaultXonotic.cfg
qcsrc/server/autocvars.qh