]> de.git.xonotic.org Git - xonotic/mediasource.git/commitdiff
projects / xonotic / mediasource.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e78daa7 6e45ac8)
Merge remote-tracking branch 'origin/diabolik/playermelee'
authormerlijn <mhofstra@gmail.com>
Wed, 11 May 2011 04:52:52 +0000 (06:52 +0200)
committermerlijn <mhofstra@gmail.com>
Wed, 11 May 2011 04:52:52 +0000 (06:52 +0200)

Trivial merge