]> 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: 6767bdc f33228c)
Merge remote branch 'origin/master' into samual/keepaway
authorunknown <samual@xonotic.org>
Tue, 23 Nov 2010 23:56:09 +0000 (18:56 -0500)
committerunknown <samual@xonotic.org>
Tue, 23 Nov 2010 23:56:09 +0000 (18:56 -0500)

Trivial merge