]> 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: c42c4d1 26641d5)
Merge remote branch 'origin/master' into samual/seeker_updates
authorSamual <samual@xonotic.org>
Sat, 19 Mar 2011 19:42:06 +0000 (15:42 -0400)
committerSamual <samual@xonotic.org>
Sat, 19 Mar 2011 19:42:06 +0000 (15:42 -0400)

Trivial merge