]> 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: 95a13db 2f1026d)
Merge remote branch 'origin/master' into samual/keepaway
authorunknown <samual@xonotic.org>
Mon, 15 Nov 2010 19:19:11 +0000 (14:19 -0500)
committerunknown <samual@xonotic.org>
Mon, 15 Nov 2010 19:19:11 +0000 (14:19 -0500)

Trivial merge