]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 938b512 07c9518)
Merge commit 'origin/tzork/vehicles'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 14 Apr 2010 17:58:01 +0000 (19:58 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 14 Apr 2010 17:58:01 +0000 (19:58 +0200)

Trivial merge