]> 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: 30dd664 8b3bcf0)
Merge remote branch 'origin/samual/balanceSamual'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 21 May 2010 21:18:06 +0000 (23:18 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 21 May 2010 21:18:06 +0000 (23:18 +0200)

Trivial merge