]> 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: 1ff9a19 529205a)
Merge branch 'master' into martin-t/okc2
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 3 Sep 2017 19:13:13 +0000 (21:13 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 3 Sep 2017 19:13:13 +0000 (21:13 +0200)
1  2 
mutators.cfg patch | diff1 | diff2 | blob | history

diff --cc mutators.cfg
Simple merge