]> 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: 6b38626 e2206fe)
Merge branch 'master' into martin-t/vbots
authorMartin Taibr <taibr.martin@gmail.com>
Wed, 18 Sep 2019 03:14:23 +0000 (05:14 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Wed, 18 Sep 2019 03:14:23 +0000 (05:14 +0200)
1  2 
commands.cfg patch | diff1 | diff2 | blob | history
xonotic-server.cfg patch | diff1 | diff2 | blob | history

diff --cc commands.cfg
Simple merge
diff --cc xonotic-server.cfg
Simple merge