]> 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: b55ae52 05b7ffd)
Merge remote branch 'origin/master' into samual/fixes_for_latest_merge
authorSamual <samual@xonotic.org>
Mon, 14 Mar 2011 22:05:27 +0000 (18:05 -0400)
committerSamual <samual@xonotic.org>
Mon, 14 Mar 2011 22:05:27 +0000 (18:05 -0400)

Trivial merge