]> 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: d902fed 76afe6b)
Merge branch 'master' into Mario/survival
authorMario <mario.mario@y7mail.com>
Sun, 2 Aug 2020 09:15:03 +0000 (19:15 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 2 Aug 2020 09:15:03 +0000 (19:15 +1000)
1  2 
qcsrc/common/ent_cs.qc patch | diff1 | diff2 | blob | history
qcsrc/common/stats.qh patch | diff1 | diff2 | blob | history
qcsrc/server/g_world.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/ent_cs.qc
Simple merge
diff --cc qcsrc/common/stats.qh
Simple merge
diff --cc qcsrc/server/g_world.qc
Simple merge