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

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

projects / xonotic / xonotic-data.pk3dir.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b8018d3 1471179)

author	Mario <zacjardine@y7mail.com>
	Wed, 15 Jul 2015 05:43:30 +0000 (15:43 +1000)
committer	Mario <zacjardine@y7mail.com>
	Wed, 15 Jul 2015 05:43:30 +0000 (15:43 +1000)
commit	777dc5e23d7512c3e33576884d8d200f244d3006
tree	53fd60a925e3fa3883694381ad4383d540fc84f7	tree \| snapshot
parent	b8018d31cf40eadadfadfad602edd726d137866b	commit \| diff
parent	1471179ee293a17194be4e25c1e387bd451370a6	commit \| diff

Merge branch 'master' into Mario/qc_physics_prehax

Conflicts:
qcsrc/server/autocvars.qh
qcsrc/server/defs.qh
qcsrc/server/g_triggers.qc
qcsrc/server/g_triggers.qh

15 files changed:

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/wall.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/physics.qc	diff1 \|	\|	blob \| history
qcsrc/common/physics.qh	diff1 \|	\|	blob \| history
qcsrc/common/triggers/triggers.qc	diff1 \|	\|	blob \| history
qcsrc/common/triggers/triggers.qh	diff1 \|	\|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_physics.qc	blob1 \|	blob2 \|	history
qcsrc/server/command/cmd.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_models.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qh	diff1 \|	diff2 \|	blob \| history