]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c87f467 f08c925)
Merge remote branch 'origin/master' into diabolik/afterslime
authorssinghal <dib.diabolik@gmail.com>
Tue, 1 Feb 2011 20:21:29 +0000 (15:21 -0500)
committerssinghal <dib.diabolik@gmail.com>
Tue, 1 Feb 2011 20:21:29 +0000 (15:21 -0500)

Trivial merge