Merge remote-tracking branch 'origin/zykure/playerstats_ladders' into samual/combined...
authorSamual Lenks <samual@xonotic.org>
Tue, 26 Nov 2013 02:23:29 +0000 (21:23 -0500)
committerSamual Lenks <samual@xonotic.org>
Tue, 26 Nov 2013 02:23:29 +0000 (21:23 -0500)
commit85119d4a165562bcd7206c151255b8e680000367
tree6df9a4e83531418aeb26689946edafc8860cea16
parent34c3a406a8ea398762916f733b810e3bb68ada12
parent2a172d24a132bbcd7e0dc24c8d492c72442d768a
Merge remote-tracking branch 'origin/zykure/playerstats_ladders' into samual/combined_updates

Conflicts:
qcsrc/common/playerstats.qc
qcsrc/common/playerstats.qc
qcsrc/server/autocvars.qh
qcsrc/server/g_world.qc