]> 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: 06e9a67 ed5c291)
Merge remote branch 'origin/samual/fix_hook_in_vehicles'
authorSamual <samual@xonotic.org>
Fri, 23 Sep 2011 05:54:18 +0000 (01:54 -0400)
committerSamual <samual@xonotic.org>
Fri, 23 Sep 2011 05:54:18 +0000 (01:54 -0400)

Trivial merge