]> git.rm.cloudns.org Git - xonotic/xonstat.git/commitdiff
projects / xonotic / xonstat.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dace5d8 58a197b)
Merge branch 'zykure/approved' of ssh://push.git.xonotic.org/xonstat into zykure...
authorAnt Zucaro <azucaro@gmail.com>
Thu, 1 Aug 2013 02:00:20 +0000 (22:00 -0400)
committerAnt Zucaro <azucaro@gmail.com>
Thu, 1 Aug 2013 02:00:20 +0000 (22:00 -0400)

Trivial merge