Skip to content
Snippets Groups Projects
Commit 15018b2d authored by wiepke's avatar wiepke
Browse files

Merge remote-tracking branch 'origin/speechtools-fixes-again' into CleaningDevelopment 

# Conflicts:
#	Assets/Scenes/ChemistryRoom.unity
#	Packages/vr.teachr.measurements/Runtime/MeasureController.prefab
#	Packages/vr.teachr.measurements/Runtime/SpeechTools/Prefabs/SpeechToolsController.prefab
#	Packages/vr.teachr.measurements/Runtime/SpeechTools/Prefabs/SpeechToolsController.prefab.meta
#	Packages/vr.teachr.measurements/Runtime/SpeechTools/SpeechTools.prefab
parents cdc4bf80 b91ae0db
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1916 additions and 2913 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment