Merge branch 'Mario/showspecs' into 'master'
authorTimePath <andrew.hardaker1995@gmail.com>
Sat, 6 Aug 2016 06:46:36 +0000 (06:46 +0000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sat, 6 Aug 2016 06:46:36 +0000 (06:46 +0000)
Merge branch Mario/showspecs (M merge request)

Shows who's spectating you (disabled by default).

See merge request !340

1  2 
defaultXonotic.cfg
qcsrc/client/hud/panel/infomessages.qc
qcsrc/client/main.qc
qcsrc/client/main.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge