]> 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: 6159f9e 7792741)
Merge remote branch 'origin/samual/samualbalance'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 16:46:59 +0000 (17:46 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 16:46:59 +0000 (17:46 +0100)

Trivial merge