projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ef456a7 61659a0)
Merge branch 'master' into martin-t/okc2
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 29 Oct 2017 00:36:16 +0000 (02:36 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 29 Oct 2017 00:36:16 +0000 (02:36 +0200)
1  2 
mutators.cfg patch | diff1 | diff2 | blob | history

diff --cc mutators.cfg
Simple merge