Merge remote-tracking branch 'origin/divVerent/crypto-fixes'
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 9 Feb 2015 11:07:58 +0000 (12:07 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 9 Feb 2015 11:07:58 +0000 (12:07 +0100)
commitf2c50fe4e6218a0a1bb0ca078ee122c5ba6a238d
tree694120d2b8f24e7c2abc1640e771c6e0612a1e85
parent21b1558a688667b42531fbb33df048784f655148
parente9b6935e58263d814ce1238274b6fcf0b188255f
Merge remote-tracking branch 'origin/divVerent/crypto-fixes'
qcsrc/dpdefs/csprogsdefs.qh
qcsrc/dpdefs/dpextensions.qh
qcsrc/dpdefs/menudefs.qh
qcsrc/server/cl_client.qc
qcsrc/server/ipban.qc