]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b541d64 e073488)
Merge branch 'master' into martin-t/overkill
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 13 Mar 2017 23:01:55 +0000 (00:01 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 13 Mar 2017 23:01:55 +0000 (00:01 +0100)
1  2 
mutators.cfg patch | diff1 | diff2 | blob | history

diff --cc mutators.cfg
Simple merge