]> 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: 9f267ed 3015091)
Merge branch 'master' into terencehill/arc-beam_more_fixes terencehill/arc-beam_more_fixes 1304/head
authorterencehill <piuntn@gmail.com>
Wed, 24 Jul 2024 09:35:03 +0000 (11:35 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 24 Jul 2024 09:35:03 +0000 (11:35 +0200)
1  2 
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history

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