]> 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: 4362b74 25e676a)
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Wed, 4 Apr 2018 16:55:35 +0000 (19:55 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 4 Apr 2018 16:55:35 +0000 (19:55 +0300)
1  2 
bal-wep-overkill.cfg patch | diff1 | diff2 | blob | history
bal-wep-xonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/server/defs.qh patch | diff1 | diff2 | blob | history

diff --cc bal-wep-overkill.cfg
Simple merge
diff --cc bal-wep-xonotic.cfg
Simple merge
diff --cc qcsrc/server/defs.qh
Simple merge