]> 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: 18d6521 76c2456)
Merge remote branch 'refs/remotes/origin/diabolik/umbraplayermodel'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 15 May 2010 17:49:29 +0000 (19:49 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 15 May 2010 17:49:29 +0000 (19:49 +0200)

Trivial merge