summaryrefslogtreecommitdiff
path: root/thirdparty/embree/patches/godot-changes-noexcept.patch
diff options
context:
space:
mode:
authorMarcel Admiraal <madmiraal@users.noreply.github.com>2021-11-21 06:51:44 +0000
committerMarcel Admiraal <madmiraal@users.noreply.github.com>2021-11-21 07:01:33 +0000
commit826ea43af6446f4f2ce3f9dc7464a0a320052ed9 (patch)
treeacc439c71c6c3b06191c5b81becc381927179d71 /thirdparty/embree/patches/godot-changes-noexcept.patch
parented02b8af59fceb48798c857306335fe0f7ff6a8a (diff)
Fix merge conflict between #42711 and #42374
Diffstat (limited to 'thirdparty/embree/patches/godot-changes-noexcept.patch')
0 files changed, 0 insertions, 0 deletions