Cody Wright 97bc98470b Merge branch 'development' into feature/2177-Update-Lighting ... # Conflicts: # Assets/Prefabs/LabSpace.prefab # Assets/Scenes/BasicScene.unity # Assets/Scenes/BasicScene/LightingData.asset # Assets/Scenes/BasicScene/Lightmap-0_comp_dir.png # Assets/Scenes/BasicScene/Lightmap-0_comp_light.exr # Assets/Scenes/BasicScene/Lightmap-1_comp_dir.png # Assets/Scenes/BasicScene/Lightmap-1_comp_light.exr # Assets/Scenes/BasicScene/Lightmap-2_comp_dir.png # Assets/Scenes/BasicScene/Lightmap-2_comp_light.exr # Assets/Scenes/BasicScene/ReflectionProbe-0.exr		2024-01-24 11:52:18 -05:00
..
Project Configuration	Merge branch 'development' into feature/2177-Update-Lighting	2024-01-24 11:52:18 -05:00
Project Configuration.meta	Adding XR project and BasicScene for Stratasys development	2023-10-30 08:42:18 -04:00