]> 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: cdb5ed0 2db946f)
Merge remote-tracking branch 'origin/morosophos/enhance-demo-record-markers' into...
authorNick S <nick@teichisma.info>
Thu, 27 Jan 2022 15:51:23 +0000 (17:51 +0200)
committerNick S <nick@teichisma.info>
Thu, 27 Jan 2022 15:51:23 +0000 (17:51 +0200)
1  2 
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc patch | diff1 | diff2 | blob | history
qcsrc/server/race.qc patch | diff1 | diff2 | blob | history
qcsrc/server/race.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/race.qc
Simple merge
diff --cc qcsrc/server/race.qh
Simple merge