git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit

]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit

Merge branch 'master' into morphed/splashfx

# Conflicts:
# qcsrc/common/physics/movetypes/movetypes.qc

qcsrc/client/weapons/projectile.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/effects/all.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/physics/movetypes/movetypes.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/lib/self.qh	diff1 \|	diff2 \|	blob \| history