]> 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: 037e96a 5d10e7f)
Merge remote-tracking branch 'origin/diabolik/playermelee'
authormerlijn <mhofstra@gmail.com>
Tue, 10 May 2011 19:12:23 +0000 (21:12 +0200)
committermerlijn <mhofstra@gmail.com>
Tue, 10 May 2011 19:12:23 +0000 (21:12 +0200)

Trivial merge