]> git.xonotic.org Git - xonotic/xonstat.git/commitdiff
projects / xonotic / xonstat.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7e877a df71363)
Merge branch 'pickupbot' into approved
authorJan D. Behrens <zykure@web.de>
Thu, 20 Sep 2012 17:43:15 +0000 (19:43 +0200)
committerJan D. Behrens <zykure@web.de>
Thu, 20 Sep 2012 17:43:15 +0000 (19:43 +0200)

Trivial merge