]> de.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: db1e081 ea816ec)
Merge branch 'tzork/vehicles-2' of ssh://git.xonotic.org/xonotic-data.pk3dir into...
authorJakob MG <jakob_mg@hotmail.com>
Wed, 6 Apr 2011 08:38:39 +0000 (10:38 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Wed, 6 Apr 2011 08:38:39 +0000 (10:38 +0200)

Trivial merge