]> 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: ae8ee92 abe1c7c)
Merge remote branch 'origin/samual/samualbalance'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 15 Nov 2010 06:36:48 +0000 (07:36 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 15 Nov 2010 06:36:48 +0000 (07:36 +0100)

Trivial merge