]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'tzork/vehicles-2' of ssh://git.xonotic.org/xonotic-data.pk3dir into...
authorMorphed <Morphed@o2.pl>
Tue, 5 Apr 2011 00:51:10 +0000 (02:51 +0200)
committerMorphed <Morphed@o2.pl>
Tue, 5 Apr 2011 00:51:10 +0000 (02:51 +0200)

Trivial merge