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: 7fb4dc7 61659a0)

author	Martin Taibr <taibr.martin@gmail.com>
	Sun, 29 Oct 2017 00:36:41 +0000 (02:36 +0200)
committer	Martin Taibr <taibr.martin@gmail.com>
	Sun, 29 Oct 2017 00:36:41 +0000 (02:36 +0200)
commit	7641890b1d739a3b96966c0676f9cceee0a8b030
tree	7687991a819d7498010c16222e1d5896de35cb3e	tree \| snapshot
parent	7fb4dc7facfc16f556838903755c04c7bbda03f0	commit \| diff
parent	61659a08c8e5f2cf5469978b2e0ebba42b349ebf	commit \| diff

Merge branch 'master' into martin-t/okc3

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