]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into tzork/vehicles-2
authorJakob MG <jakob_mg@hotmail.com>
Sat, 9 Apr 2011 05:40:58 +0000 (07:40 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Sat, 9 Apr 2011 05:40:58 +0000 (07:40 +0200)
commitd444caca30715e32968c90df10fa7d131627c701
tree0c98e241b6b016a9195b75d3a9ef92079474c9d6
parentf49024755eeeec8c0c2b44ac28ff6acbcfbd86a3
parent8d640f864cdbdefc91f91897447abfd2639f9efe
Merge remote-tracking branch 'origin/master' into tzork/vehicles-2
qcsrc/server/ctf.qc