]> 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: 9f8063c a0b22ba)
Merge remote branch 'refs/remotes/origin/diabolik/weaponscale'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 16 May 2010 18:53:02 +0000 (20:53 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 16 May 2010 18:53:02 +0000 (20:53 +0200)

Trivial merge