]> 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: fcc8aed 1078d03)
Merge remote-tracking branch 'origin/ablu/bumblebeefix'
authorSamual Lenks <samual@xonotic.org>
Sat, 15 Jun 2013 06:18:08 +0000 (02:18 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 15 Jun 2013 06:18:08 +0000 (02:18 -0400)

Trivial merge