Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir into Melanosuch...
authorMattia Basaglia <mattia.basaglia@gmail.com>
Wed, 18 Feb 2015 15:13:25 +0000 (16:13 +0100)
committerMattia Basaglia <mattia.basaglia@gmail.com>
Wed, 18 Feb 2015 15:13:25 +0000 (16:13 +0100)
1  2 
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/dpdefs/csprogsdefs.qh
qcsrc/server/cl_client.qc

Simple merge
Simple merge
Simple merge
Simple merge