]> 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: 5d9a9fc 943e3fc)
Merge branch 'master' into diabolik/umbraplayermodel
authorRudolf Polzer <divverent@alientrap.org>
Mon, 10 May 2010 07:31:38 +0000 (09:31 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 10 May 2010 07:31:38 +0000 (09:31 +0200)

Trivial merge