]> 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: 2494f19 c8b0874)
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
authorNikolay S <nick@teichisma.info>
Thu, 21 Sep 2023 20:32:21 +0000 (23:32 +0300)
committerNikolay S <nick@teichisma.info>
Thu, 21 Sep 2023 20:32:21 +0000 (23:32 +0300)
1  2 
qcsrc/client/hud/panel/strafehud.qc patch | diff1 | diff2 | blob | history
qcsrc/server/main.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/hud/panel/strafehud.qc
Simple merge
diff --cc qcsrc/server/main.qc
Simple merge