Merge remote-tracking branch 'origin/zykure/playerstats' into samual/combined_updates
authorSamual Lenks <samual@xonotic.org>
Mon, 19 Aug 2013 17:14:18 +0000 (13:14 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 19 Aug 2013 17:14:18 +0000 (13:14 -0400)
commit075742aea571f7811b4a96da750a8d02af97073c
tree2af7e3405869c87e300b286adab73bd3272ab0fa
parent22e6d2fe186dcc702de9d4493eb1959be73c9707
parenta1565880dbae0c12a4be377d26bf90bd3c0f675f
Merge remote-tracking branch 'origin/zykure/playerstats' into samual/combined_updates

Conflicts:
qcsrc/server/cl_client.qc
qcsrc/server/miscfunctions.qc
qcsrc/menu/menu.qc
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src