]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8854000 dd70edc)
Merge branch 'master' into zykure/teamscores
authorJan Behrens <zykure@web.de>
Fri, 10 May 2013 13:55:03 +0000 (15:55 +0200)
committerJan Behrens <zykure@web.de>
Fri, 10 May 2013 13:55:03 +0000 (15:55 +0200)
1  2 
qcsrc/server/playerstats.qc patch | diff1 | diff2 | blob | history
qcsrc/server/scores.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/playerstats.qc
Simple merge
diff --cc qcsrc/server/scores.qc
Simple merge