]> 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: f7da9a3 6baaca2)
Merge remote-tracking branch 'origin/master' into samual/fix_deathfade
authorSamual Lenks <samual@xonotic.org>
Sat, 1 Jun 2013 02:01:02 +0000 (22:01 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 1 Jun 2013 02:01:02 +0000 (22:01 -0400)

Trivial merge