]> 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: 59385ad 8ead9bc)
Merge commit 'origin/tzork/vehicles'
authorRudolf Polzer <rpolzer@grawp.(none)>
Fri, 2 Apr 2010 21:10:42 +0000 (23:10 +0200)
committerRudolf Polzer <rpolzer@grawp.(none)>
Fri, 2 Apr 2010 21:10:42 +0000 (23:10 +0200)

Trivial merge