]> de.git.xonotic.org Git - xonotic/xonstat.git/commitdiff
projects / xonotic / xonstat.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9ee9112 d665507)
Merge branch 'approved' of git://gitorious.org/xonotic/xonstat into zykure-approved
authorAnt Zucaro <azucaro@gmail.com>
Sat, 2 Feb 2013 16:13:37 +0000 (11:13 -0500)
committerAnt Zucaro <azucaro@gmail.com>
Sat, 2 Feb 2013 16:13:37 +0000 (11:13 -0500)

Trivial merge