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: 3e6e644 c58baab)

author	bones_was_here <bones_was_here@xa.org.au>
	Sun, 11 Jul 2021 10:21:33 +0000 (20:21 +1000)
committer	bones_was_here <bones_was_here@xa.org.au>
	Sun, 11 Jul 2021 10:21:33 +0000 (20:21 +1000)
commit	39ff67006e98371c2961166ea52984024d9d3fab
tree	a8fffb3c5d49aed7e46f7b25087a07b461dabbea	tree \| snapshot
parent	3e6e644488b54b638078fb88b88c643e103ac8e1	commit \| diff
parent	c58baab5bd2dc4a77eb7d8e97824621d887c8e75	commit \| diff

Resolve conflicts 1: Merge commit 'c58baab5' into bones_was_here/q3compat

19 files changed:

qcsrc/common/items/item.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/buffs/all.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/buffs/buffs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/buffs/sv_buffs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/stats.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/all.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/lib/spawnfunc.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/lib/warpzone/common.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/compat/quake3.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/items/items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/items/items.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/race.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/world.qc	diff1 \|	diff2 \|	blob \| history
xonotic-server.cfg	diff1 \|	diff2 \|	blob \| history