]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3806086 0ce1c5f)
Merge remote-tracking branch 'origin/zykure/teamscores'
authorSamual Lenks <samual@xonotic.org>
Sat, 1 Jun 2013 19:47:42 +0000 (15:47 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 1 Jun 2013 19:47:42 +0000 (15:47 -0400)
1  2 
qcsrc/server/playerstats.qc patch | diff1 | diff2 | blob | history

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