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: c301bdc 28bca62)

author	drjaska <drjaska83@gmail.com>
	Sun, 29 Aug 2021 03:34:27 +0000 (06:34 +0300)
committer	drjaska <drjaska83@gmail.com>
	Sun, 29 Aug 2021 03:34:27 +0000 (06:34 +0300)
commit	073eb81b364a794bf3fffdd4072235a047385880
tree	0fb552af97c2e366c5f5eeccb8c683acfd566df5	tree \| snapshot
parent	c301bdcee62ffb7db485676e76f711b1fe82d1d6	commit \| diff
parent	28bca62be90dfdcfc95e01a0ab22f00584d991f5	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