]> de.git.xonotic.org Git - xonotic/xonstat.git/commitdiff
projects / xonotic / xonstat.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d1fcd9 65e6017)
Merge branch 'master' of http://git.xonotic.org/xonotic/xonstat into approved
authorJan Behrens <zykure@web.de>
Sat, 2 Feb 2013 16:26:16 +0000 (17:26 +0100)
committerJan Behrens <zykure@web.de>
Sat, 2 Feb 2013 16:26:16 +0000 (17:26 +0100)

Trivial merge