]> 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 | compact (merge: 7316fb7 55efb79)
Merge remote branch 'origin/diabolik/pyriaplayermodel'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 13 May 2010 17:29:16 +0000 (19:29 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 13 May 2010 17:29:16 +0000 (19:29 +0200)

Trivial merge