]> 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: bb39c30 8705d35)
Merge branch 'master' into LegendaryGuard/armorizing_and_dark_nades
authorLegendaryGuard <rootuser999@gmail.com>
Sun, 27 Nov 2022 20:27:14 +0000 (21:27 +0100)
committerLegendaryGuard <rootuser999@gmail.com>
Sun, 27 Nov 2022 20:27:14 +0000 (21:27 +0100)
1  2 
qcsrc/client/main.qc patch | diff1 | diff2 | blob | history

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