]> 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: 32f13eb 9291a66)
Merge branch 'Mario/plasma_removal' into 'master'
authorDr. Jaska <drjaska83@gmail.com>
Thu, 31 Oct 2024 13:34:16 +0000 (13:34 +0000)
committerDr. Jaska <drjaska83@gmail.com>
Thu, 31 Oct 2024 13:34:16 +0000 (13:34 +0000)
Remove the unused Plasma ammo type

Closes #2936

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

1  2 
qcsrc/server/cheats.qc patch | diff1 | diff2 | blob | history
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history
qcsrc/server/world.qc patch | diff1 | diff2 | blob | history

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