]> de.git.xonotic.org Git - xonotic/xonstat.git/commitdiff
projects / xonotic / xonstat.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51cb9c3 c9a891f)
Merge branch 'approved' of gitorious.org:xonotic/xonstat into approved
authorJan Behrens <zykure@web.de>
Wed, 16 Jan 2013 18:47:01 +0000 (19:47 +0100)
committerJan Behrens <zykure@web.de>
Wed, 16 Jan 2013 18:47:01 +0000 (19:47 +0100)

Trivial merge