]> 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 | compact (merge: 9157b0d 1caa66e)
Merge remote branch 'origin/master' into samual/keepaway
authorunknown <samual@xonotic.org>
Thu, 25 Nov 2010 07:18:22 +0000 (02:18 -0500)
committerunknown <samual@xonotic.org>
Thu, 25 Nov 2010 07:18:22 +0000 (02:18 -0500)

Trivial merge