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: 5471ac4 47ec820)

author	drjaska <drjaska83@gmail.com>
	Sun, 7 Nov 2021 02:08:39 +0000 (04:08 +0200)
committer	drjaska <drjaska83@gmail.com>
	Sun, 7 Nov 2021 02:08:39 +0000 (04:08 +0200)
commit	5baf4a8bdef5ebc1732bf3252343115c3b2acf46
tree	ea8fde36cd1cb7f715e8e5fc74ab86d8e32fa866	tree \| snapshot
parent	5471ac4b563c59bafe4566c3a4e3ef6ee3847464	commit \| diff
parent	47ec8202d51bcd12b727f12b9dca09b1927e6187	commit \| diff

Merge branch 'master' into drjaska/mayhem

balance-mario.cfg	diff1 \|	diff2 \|	blob \| history
balance-nexuiz25.cfg	diff1 \|	diff2 \|	blob \| history
balance-overkill.cfg	diff1 \|	diff2 \|	blob \| history
balance-samual.cfg	diff1 \|	diff2 \|	blob \| history
balance-xdf.cfg	diff1 \|	diff2 \|	blob \| history
balance-xonotic.cfg	diff1 \|	diff2 \|	blob \| history
balance-xpm.cfg	diff1 \|	diff2 \|	blob \| history
gamemodes-server.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/server/world.qc	diff1 \|	diff2 \|	blob \| history