Merging music-ui branch with master.

ChrissiQ · Jan 28, 2018 · 2e6a3b6 · 2e6a3b6
2 parents c02243e + a3f3024
commit 2e6a3b6
Show file tree

Hide file tree

Showing 691 changed files with 131,149 additions and 34 deletions.
diff --git a/Assets/EffectExamples.meta b/Assets/EffectExamples.meta
diff --git a/Assets/EffectExamples/Profiles.meta b/Assets/EffectExamples/Profiles.meta
diff --git a/Assets/EffectExamples/Profiles/EffectsProfile.asset b/Assets/EffectExamples/Profiles/EffectsProfile.asset
diff --git a/Assets/EffectExamples/Profiles/EffectsProfile.asset.meta b/Assets/EffectExamples/Profiles/EffectsProfile.asset.meta
diff --git a/Assets/EffectExamples/Shared.meta b/Assets/EffectExamples/Shared.meta
diff --git a/Assets/EffectExamples/Shared/Animation.meta b/Assets/EffectExamples/Shared/Animation.meta
diff --git a/Assets/EffectExamples/Shared/Animation/Animations.meta b/Assets/EffectExamples/Shared/Animation/Animations.meta