]> 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: 5b3c987 418ed2b)
Merge branch 'tzork/vehicles-2' of ssh://git.xonotic.org/xonotic-data.pk3dir into...
authorJakob MG <jakob_mg@hotmail.com>
Tue, 5 Apr 2011 18:04:35 +0000 (20:04 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Tue, 5 Apr 2011 18:04:35 +0000 (20:04 +0200)

Trivial merge