]> 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: 5f03fdd b2d3d16)
Merge branch 'martin-t/okc2' into martin-t/okc3
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 27 Aug 2017 16:58:01 +0000 (18:58 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 27 Aug 2017 16:58:01 +0000 (18:58 +0200)
1  2 
balance-overkill.cfg patch | diff1 | diff2 | blob | history
qcsrc/server/g_damage.qc patch | diff1 | diff2 | blob | history

diff --cc balance-overkill.cfg
Simple merge
diff --cc qcsrc/server/g_damage.qc
Simple merge