]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/weapons
authorSamual Lenks <samual@xonotic.org>
Sat, 14 Sep 2013 04:08:09 +0000 (00:08 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 14 Sep 2013 04:08:09 +0000 (00:08 -0400)
commit7ed6b5adc348af2a7094c85517e824c04e2005cd
treef5358a419cddba5cd182518c4ad317ce75eb8390
parenta78aef04c4dcb416d041564e656da105eff84558
parent06ee57203283ee16b27a716619866d0a524b6505
Merge remote-tracking branch 'origin/master' into samual/weapons

Conflicts:
qcsrc/common/weapons/w_fireball.qc
qcsrc/server/w_crylink.qc
qcsrc/server/w_grenadelauncher.qc
qcsrc/server/w_minelayer.qc
qcsrc/server/w_rocketlauncher.qc
qcsrc/common/weapons/w_crylink.qc
qcsrc/common/weapons/w_devastator.qc
qcsrc/common/weapons/w_electro.qc
qcsrc/common/weapons/w_fireball.qc
qcsrc/common/weapons/w_minelayer.qc
qcsrc/common/weapons/w_mortar.qc
qcsrc/server/cheats.qc
qcsrc/server/cl_player.qc
qcsrc/server/g_damage.qc
qcsrc/server/mutators/mutator_minstagib.qc
qcsrc/server/weapons/accuracy.qc