]> 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: fb1dcac 8681cba)
Merge remote-tracking branch 'origin/ablu/vehiclebalance'
authorSamual Lenks <samual@xonotic.org>
Thu, 8 Aug 2013 23:24:54 +0000 (19:24 -0400)
committerSamual Lenks <samual@xonotic.org>
Thu, 8 Aug 2013 23:24:54 +0000 (19:24 -0400)

Trivial merge