]> 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: 607485d 0ae1792)
Merge branch 'martin-t/AMMO' into martin-t/master2
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 18 Aug 2019 18:31:56 +0000 (20:31 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 18 Aug 2019 18:31:56 +0000 (20:31 +0200)
1  2 
bal-wep-xonotic.cfg patch | diff1 | diff2 | blob | history
xonotic-server.cfg patch | diff1 | diff2 | blob | history

diff --cc bal-wep-xonotic.cfg
Simple merge
diff --cc xonotic-server.cfg
Simple merge