]> git.rm.cloudns.org Git - xonotic/xonstat.git/commitdiff
projects / xonotic / xonstat.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 75e7a76 124c400)
Merge branch 'master' into zykure/approved
authorJan Behrens <zykure@web.de>
Sun, 21 Apr 2013 20:47:57 +0000 (22:47 +0200)
committerJan Behrens <zykure@web.de>
Sun, 21 Apr 2013 20:47:57 +0000 (22:47 +0200)
1  2 
xonstat/templates/map_info.mako patch | diff1 | diff2 | blob | history
xonstat/templates/server_info.mako patch | diff1 | diff2 | blob | history

diff --cc xonstat/templates/map_info.mako
Simple merge
diff --cc xonstat/templates/server_info.mako
Simple merge