]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3776190 db7e471)
Merge remote branch 'refs/remotes/origin/diabolik/weaponscale'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 18 May 2010 19:00:24 +0000 (21:00 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 18 May 2010 19:00:24 +0000 (21:00 +0200)

Trivial merge