]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit138cbbad0d235f41c6473bb5aa92169808485417
treed55ab717a4ffe25c96c0609749b1f5da89270651
parent2993044659f4dd9ce87602e3db246f6d7a2aa75c
parentab627cfdaf4471d36df58a771b2dac1ff24e9de9
Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir into Melanosuchus/minigames
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/dpdefs/csprogsdefs.qh
qcsrc/server/cl_client.qc