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)
1  2 
qcsrc/client/main.qh
qcsrc/client/scoreboard.qc

Simple merge
Simple merge