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: 8224061 04692f3)

author	Lyberta <lyberta@lyberta.net>
	Sun, 27 Aug 2017 23:45:39 +0000 (02:45 +0300)
committer	Lyberta <lyberta@lyberta.net>
	Sun, 27 Aug 2017 23:45:39 +0000 (02:45 +0300)
commit	1ae4bd4e4ab336706299d833ec4fd293214e756e
tree	afd0b0458b396a29bbea5a7aa7c0f44147ad91ac	tree \| snapshot
parent	82240612f4b2a109986d40841230d5146f9d923a	commit \| diff
parent	04692f3bf447ec38a1bbb0a330c288bbe7a42726	commit \| diff

Merge branch 'Lyberta/TeamplayFixes_' into Lyberta/Survival

12 files changed:

balance-mario.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
qcsrc/common/t_items.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/t_items.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history