# Conflicts:
#	Assets/04_Models/Festival/Canopy/swing-sofa/shaded 1.png.meta
#	Assets/04_Models/Festival/Canopy/swing-sofa/texture_diffuse 1.png.meta
#	Assets/04_Models/Festival/Canopy/swing-sofa/texture_metallic 1.png.meta
#	Assets/04_Models/Festival/Canopy/swing-sofa/texture_normal 1.png.meta
#	Assets/04_Models/Festival/Canopy/swing-sofa/texture_roughness 1.png.meta
#	Assets/XR/Settings/OpenXR Package Settings.asset
This commit is contained in:
dldydtn9755-crypto
2026-07-23 15:13:40 +09:00
279 changed files with 11219 additions and 1161 deletions