]> 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: edea7ba f837f03)
Merge remote branch 'refs/remotes/origin/diabolik/pyriaplayermodel'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 18 May 2010 18:55:12 +0000 (20:55 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 18 May 2010 18:55:12 +0000 (20:55 +0200)

Trivial merge