]> 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: 9256659 662cc36)
Merge "Add some spectating options and polish"
authorbones_was_here <bones_was_here@xonotic.au>
Tue, 13 May 2025 08:08:11 +0000 (18:08 +1000)
committerbones_was_here <bones_was_here@xonotic.au>
Tue, 13 May 2025 08:08:11 +0000 (18:08 +1000)
Source branch: 'bones_was_here/spec_stuff'
Target branch: 'master'

See merge request xonotic/xonotic-data.pk3dir!1498

1  2 
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history
qcsrc/server/command/vote.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/client.qc
Simple merge
diff --cc qcsrc/server/command/vote.qc
Simple merge