]> 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: 12c9954 e621c3a)
Merge remote-tracking branch 'origin/mand1nga/bot-fixes-II'
authorRudolf Polzer <divverent@xonotic.org>
Sun, 28 Aug 2011 18:32:48 +0000 (20:32 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 28 Aug 2011 18:32:48 +0000 (20:32 +0200)

Trivial merge