]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a2de77 a4c29b5)
Merge branch 'master' into Mario/status_effects_extended
authorMario <mario.mario@y7mail.com>
Tue, 22 Jun 2021 10:57:52 +0000 (20:57 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 22 Jun 2021 10:57:52 +0000 (20:57 +1000)
1  2 
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history
qcsrc/server/items/items.qc patch | diff1 | diff2 | blob | history

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