]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f2ae373 c4d74d8)
Merge branch 'martin-t/okc' into martin-t/okc2
authorMartin Taibr <taibr.martin@gmail.com>
Fri, 25 Aug 2017 18:08:08 +0000 (20:08 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 25 Aug 2017 18:08:08 +0000 (20:08 +0200)
1  2 
mutators.cfg patch | diff1 | diff2 | blob | history

diff --cc mutators.cfg
Simple merge