From: bones_was_here <bones_was_here@xonotic.au>
Date: Sun, 26 Jan 2025 08:02:18 +0000 (+0000)
Subject: Merge "Check for a map-specific .arena file even when there's another one in the... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a928f940f663e6274a60873942e2a8034be3faa2;p=xonotic%2Fxonotic-data.pk3dir.git

Merge "Check for a map-specific .arena file even when there's another one in the pk3"

Source branch: 'bones_was_here/q3arena_fileprecedence'
Target branch: 'master'

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

a928f940f663e6274a60873942e2a8034be3faa2