]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/tzork/vehicles-2'
authorRudolf Polzer <divverent@xonotic.org>
Tue, 21 Jun 2011 17:11:18 +0000 (19:11 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 21 Jun 2011 17:11:18 +0000 (19:11 +0200)
commit0e5d97682e9478c51d8033a3ab9624471da0579d
treeb49fa15b8e8d6e3f997e36301b51241d2d28be2e
parente642aacf20f70575cc04e4a3591e26ec6537fa22
parent0e42cf58ff9ea3d71ffae95be68431f123ff88bc
Merge remote-tracking branch 'origin/tzork/vehicles-2'

Conflicts:
qcsrc/server/ctf.qc
qcsrc/common/constants.qh
qcsrc/server/ctf.qc