]> git.xonotic.org Git - xonotic/xonstat.git/commitdiff
projects / xonotic / xonstat.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b14d0f0 dfe149e)
Merge branch 'master' of http://git.xonotic.org/xonotic/xonstat into approved
authorJan Behrens <zykure@web.de>
Tue, 22 Jan 2013 16:31:08 +0000 (17:31 +0100)
committerJan Behrens <zykure@web.de>
Tue, 22 Jan 2013 16:31:08 +0000 (17:31 +0100)
1  2 
xonstat/__init__.py patch | diff1 | diff2 | blob | history
xonstat/views/__init__.py patch | diff1 | diff2 | blob | history

diff --cc xonstat/__init__.py
Simple merge
diff --cc xonstat/views/__init__.py
Simple merge