projects / xonotic / xonstat.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e7499d 43e5f97)
Merge of zykure's player_info JSON object plus a few bugfixes.
authorAnt Zucaro <azucaro@gmail.com>
Sun, 16 Sep 2012 03:48:08 +0000 (23:48 -0400)
committerAnt Zucaro <azucaro@gmail.com>
Sun, 16 Sep 2012 03:48:08 +0000 (23:48 -0400)
1  2 
xonstat/templates/base.mako patch | diff1 | diff2 | blob | history

diff --cc xonstat/templates/base.mako
Simple merge