]> 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: 1dd6830 13be05d)
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
authorNick S <nick@teichisma.info>
Sat, 19 Mar 2022 10:08:18 +0000 (12:08 +0200)
committerNick S <nick@teichisma.info>
Sat, 19 Mar 2022 10:08:18 +0000 (12:08 +0200)
1  2 
_hud_common.cfg patch | diff1 | diff2 | blob | history
qcsrc/common/constants.qh patch | diff1 | diff2 | blob | history
qcsrc/server/race.qc patch | diff1 | diff2 | blob | history

diff --cc _hud_common.cfg
Simple merge
diff --cc qcsrc/common/constants.qh
Simple merge
diff --cc qcsrc/server/race.qc
Simple merge