Merge remote-tracking branch 'origin/master' into samual/combined_updates
authorSamual Lenks <samual@xonotic.org>
Sun, 13 Oct 2013 01:17:08 +0000 (21:17 -0400)
committerSamual Lenks <samual@xonotic.org>
Sun, 13 Oct 2013 01:17:08 +0000 (21:17 -0400)
commit5c4ae3ec7458cf4e8d07f6eed4fe24fceea13b70
treee496b7f38871e0c9ae2c9e3ee6c477abde1f1b6f
parent177b9cbb5146b1f0e0cfba837c3f18bcbc6f7a3d
parent5cb34c3cbdcbec9ece2053298a62e87e66d615a1
Merge remote-tracking branch 'origin/master' into samual/combined_updates

Conflicts:
qcsrc/server/cl_client.qc
qcsrc/client/Main.qc
qcsrc/common/playerstats.qh
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/menu/menu.qc
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc