|
aff9df22cf
|
Merge remote-tracking branch 'origin/develop' into feature/multi_targets
# Conflicts:
# Assets/Resources/VuforiaConfiguration.asset
# Assets/__Scenes/CompositionMode.unity
# Packages/com.ptc.vuforia.engine-10.18.4.tgz
# Packages/manifest.json
# Packages/packages-lock.json
# ProjectSettings/EditorBuildSettings.asset
# ProjectSettings/ProjectSettings.asset
# ProjectSettings/TagManager.asset
|
2024-01-12 11:03:32 +01:00 |
|