]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/minigames/minigame/nmm.qc
Merge branch 'master' into 'terencehill/nades_stuff'
authorterencehill <piuntn@gmail.com>
Wed, 10 Apr 2024 23:07:17 +0000 (23:07 +0000)
committerterencehill <piuntn@gmail.com>
Wed, 10 Apr 2024 23:07:17 +0000 (23:07 +0000)
commitaaf1761cd58aef0700bf02f094dfc11b68d0091e
treeb5c30e6e61e31386fa41fe7ba1a254a00cb64166
parent2da426d9eec77e9745e8c80c6891dd226799c9b8
parent9ce33ce6de4553fe3473fb6541fc44b63fe3c18a
Merge branch 'master' into 'terencehill/nades_stuff'

# Conflicts:
#   qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/client/view.qc
qcsrc/common/mutators/mutator/nades/nades.qc