Merge branch 'master' into debugger/tdm_netscore
authorDebugger <pyngot@hotmail.com>
Wed, 4 Sep 2013 23:10:37 +0000 (01:10 +0200)
committerDebugger <pyngot@hotmail.com>
Wed, 4 Sep 2013 23:10:37 +0000 (01:10 +0200)
commitf111e54b35268d60a0c32ba8ff85fe63834c6c7c
tree065ec9c23a082e903ed5c410ac1a0e4f28245df2
parentdd919fdd8256ce5a92843d969b7eaea34c0c5da0
parent13ffcda7566b10fab294c6402cc5108fc0488097
Merge branch 'master' into debugger/tdm_netscore
qcsrc/client/main.qh
qcsrc/client/scoreboard.qc