]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into Melanosuchus/single_player Melanosuchus/single_player
authorMattia Basaglia <mattia.basaglia@gmail.com>
Sun, 9 Apr 2017 08:35:03 +0000 (09:35 +0100)
committerMattia Basaglia <mattia.basaglia@gmail.com>
Sun, 9 Apr 2017 08:35:03 +0000 (09:35 +0100)
commitf3437cc3473b1bec1b5d88b1acfab5e74943c988
tree13d572acd94b1a6d3c63a453fc0665619a3966c4
parente421272c3af862e6e8a7f984da8d9f6230583870
parent85a690d8a1e3eddfee959cea3dd42517484b07f4
Merge remote-tracking branch 'origin/master' into Melanosuchus/single_player
defaultXonotic.cfg
qcsrc/common/mapinfo.qh
qcsrc/common/t_items.qc
qcsrc/common/weapons/weapon/porto.qc
qcsrc/server/autocvars.qh
qcsrc/server/mutators/events.qh