K0RB4K cb917ad376 Merge remote-tracking branch 'origin/Assets' into Assets ... # Conflicts: # Assets/Materials/LaserCutter.meta # Assets/Materials/LaserCutter/laser_cutter-Body.mat.meta # Assets/Materials/LaserCutter/laser_cutter-Posts.mat.meta # Assets/Materials/LaserCutter/laser_cutter-Wheels.mat.meta # Assets/Models/Blender/laser_cutter.mtl.meta # Assets/Models/Blender/laser_cutter.obj.meta # Assets/Texture/LaserCutter/LaserCutterInteriorBack.jpg.meta # Assets/Texture/LaserCutter/LaserCutterInteriorLeft.jpg.meta # Assets/Texture/LaserCutter/LaserCutterInteriorRight.jpg.meta		2023-01-23 10:45:24 +01:00
..
Loaders	Add Steamvr Package	2023-01-10 13:17:49 +01:00
Settings	Merge remote-tracking branch 'origin/Assets' into Assets	2023-01-23 10:45:24 +01:00
Loaders.meta	Add Oculus Package	2023-01-09 11:46:20 +01:00
Settings.meta	Add Oculus Package	2023-01-09 11:46:20 +01:00
XRGeneralSettingsPerBuildTarget.asset	Catalog grab	2023-01-16 14:58:43 +01:00
XRGeneralSettingsPerBuildTarget.asset.meta	Add Oculus Package	2023-01-09 11:46:20 +01:00