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

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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: a76e107 dfebc2f)

author	Mario <mario.mario@y7mail.com>
	Sun, 8 Nov 2020 18:37:57 +0000 (04:37 +1000)
committer	Mario <mario.mario@y7mail.com>
	Sun, 8 Nov 2020 18:37:57 +0000 (04:37 +1000)
commit	82539fff2679c83e0f210649eccd4ecdcf3988fb
tree	1522c232bca3a267464b8f0480c8612b1e8fd397	tree \| snapshot
parent	a76e1077f3a7c30228bbee71014136e5f07063b2	commit \| diff
parent	dfebc2fb9d2738748fb0032b41c2acda657757a2	commit \| diff

Merge branch 'master' into Mario/electro_combo_over_time

bal-wep-mario.cfg	diff1 \|	diff2 \|	blob \| history
bal-wep-nexuiz25.cfg	diff1 \|	diff2 \|	blob \| history
bal-wep-samual.cfg	diff1 \|	diff2 \|	blob \| history
bal-wep-xdf.cfg	diff1 \|	diff2 \|	blob \| history
bal-wep-xonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/common/effects/all.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/damage.qc	diff1 \|	diff2 \|	blob \| history
testing.cfg	diff1 \|	diff2 \|	blob \| history