]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into tzork/vehicles-2
authorRudolf Polzer <divverent@xonotic.org>
Mon, 20 Jun 2011 19:33:03 +0000 (21:33 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 20 Jun 2011 19:33:03 +0000 (21:33 +0200)
Conflicts:
qcsrc/client/View.qc

1  2 
qcsrc/client/View.qc

Simple merge