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: d25b1e0 942e1c3)

author	Martin Taibr <taibr.martin@gmail.com>
	Sun, 29 Oct 2017 00:36:59 +0000 (02:36 +0200)
committer	Martin Taibr <taibr.martin@gmail.com>
	Sun, 29 Oct 2017 00:36:59 +0000 (02:36 +0200)
commit	3d98040f89a2c2da2f0a3dc41fa13317883a7fb8
tree	888e383d35335e247fe39b8e5f43b97406747137	tree \| snapshot
parent	d25b1e07bf0d4280040eb34c895fab1a349ed6ea	commit \| diff
parent	942e1c3b18b7294726a1d40e4780030430ae6da3	commit \| diff

Merge branch 'martin-t/okc2' into martin-t/master

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
defaultServer.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/sv_main.qc	diff1 \|	diff2 \|	blob \| history