]> 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: 9f1d077 7926d6c)
Merge remote branch 'origin/master' into samual/verbose_warnings
authorSamual <samual@xonotic.org>
Tue, 3 May 2011 20:56:41 +0000 (16:56 -0400)
committerSamual <samual@xonotic.org>
Tue, 3 May 2011 20:56:41 +0000 (16:56 -0400)

Trivial merge