]> 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: c852e31 201c74e)
Merge branch 'master' into Mario/team_keepaway
authorMario <mario.mario@y7mail.com>
Tue, 14 Jul 2020 09:49:11 +0000 (19:49 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 14 Jul 2020 09:49:11 +0000 (19:49 +1000)
1  2 
qcsrc/common/mapinfo.qh 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/mapinfo.qh
Simple merge
diff --cc qcsrc/common/stats.qh
Simple merge
diff --cc qcsrc/server/g_world.qc
Simple merge