microsoft
diff --git a/‎.gitignore‎
Lines changed: 1 addition & 1 deletion b/‎.gitignore‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎…oToolkit/SpatialSound/Tests/Support.meta‎ ‎Assets/HoloToolkit-Tests.meta‎Assets/HoloToolkit/SpatialSound/Tests/Support.meta renamed to Assets/HoloToolkit-Tests.meta
Lines changed: 2 additions & 2 deletions b/‎…oToolkit/SpatialSound/Tests/Support.meta‎ ‎Assets/HoloToolkit-Tests.meta‎Assets/HoloToolkit/SpatialSound/Tests/Support.meta renamed to Assets/HoloToolkit-Tests.meta
Lines changed: 2 additions & 2 deletions
diff --git a/‎Assets/HoloToolkit/Input/Tests.meta‎ ‎Assets/HoloToolkit-Tests/Input.meta‎Assets/HoloToolkit/Input/Tests.meta renamed to Assets/HoloToolkit-Tests/Input.meta b/‎Assets/HoloToolkit/Input/Tests.meta‎ ‎Assets/HoloToolkit-Tests/Input.meta‎Assets/HoloToolkit/Input/Tests.meta renamed to Assets/HoloToolkit-Tests/Input.meta
diff --git a/‎…it/Input/Tests/AnimationControllers.meta‎ ‎…it-Tests/Input/AnimationControllers.meta‎Assets/HoloToolkit/Input/Tests/AnimationControllers.meta renamed to Assets/HoloToolkit-Tests/Input/AnimationControllers.meta b/‎…it/Input/Tests/AnimationControllers.meta‎ ‎…it-Tests/Input/AnimationControllers.meta‎Assets/HoloToolkit/Input/Tests/AnimationControllers.meta renamed to Assets/HoloToolkit-Tests/Input/AnimationControllers.meta
diff --git a/‎…ionControllers/button_test_ac.controller‎ ‎…ionControllers/button_test_ac.controller‎Assets/HoloToolkit/Input/Tests/AnimationControllers/button_test_ac.controller renamed to Assets/HoloToolkit-Tests/Input/AnimationControllers/button_test_ac.controller b/‎…ionControllers/button_test_ac.controller‎ ‎…ionControllers/button_test_ac.controller‎Assets/HoloToolkit/Input/Tests/AnimationControllers/button_test_ac.controller renamed to Assets/HoloToolkit-Tests/Input/AnimationControllers/button_test_ac.controller
diff --git a/‎…ntrollers/button_test_ac.controller.meta‎ ‎…ntrollers/button_test_ac.controller.meta‎Assets/HoloToolkit/Input/Tests/AnimationControllers/button_test_ac.controller.meta renamed to Assets/HoloToolkit-Tests/Input/AnimationControllers/button_test_ac.controller.meta b/‎…ntrollers/button_test_ac.controller.meta‎ ‎…ntrollers/button_test_ac.controller.meta‎Assets/HoloToolkit/Input/Tests/AnimationControllers/button_test_ac.controller.meta renamed to Assets/HoloToolkit-Tests/Input/AnimationControllers/button_test_ac.controller.meta
diff --git a/‎…tionControllers/popup_test_ac.controller‎ ‎…tionControllers/popup_test_ac.controller‎Assets/HoloToolkit/Input/Tests/AnimationControllers/popup_test_ac.controller renamed to Assets/HoloToolkit-Tests/Input/AnimationControllers/popup_test_ac.controller b/‎…tionControllers/popup_test_ac.controller‎ ‎…tionControllers/popup_test_ac.controller‎Assets/HoloToolkit/Input/Tests/AnimationControllers/popup_test_ac.controller renamed to Assets/HoloToolkit-Tests/Input/AnimationControllers/popup_test_ac.controller
diff --git a/‎…ontrollers/popup_test_ac.controller.meta‎ ‎…ontrollers/popup_test_ac.controller.meta‎Assets/HoloToolkit/Input/Tests/AnimationControllers/popup_test_ac.controller.meta renamed to Assets/HoloToolkit-Tests/Input/AnimationControllers/popup_test_ac.controller.meta b/‎…ontrollers/popup_test_ac.controller.meta‎ ‎…ontrollers/popup_test_ac.controller.meta‎Assets/HoloToolkit/Input/Tests/AnimationControllers/popup_test_ac.controller.meta renamed to Assets/HoloToolkit-Tests/Input/AnimationControllers/popup_test_ac.controller.meta
diff --git a/‎…/HoloToolkit/Input/Tests/Animations.meta‎ ‎…/HoloToolkit-Tests/Input/Animations.meta‎Assets/HoloToolkit/Input/Tests/Animations.meta renamed to Assets/HoloToolkit-Tests/Input/Animations.meta b/‎…/HoloToolkit/Input/Tests/Animations.meta‎ ‎…/HoloToolkit-Tests/Input/Animations.meta‎Assets/HoloToolkit/Input/Tests/Animations.meta renamed to Assets/HoloToolkit-Tests/Input/Animations.meta
diff --git a/‎…ons/button_test_dehydrate_idle_anim.anim‎ ‎…ons/button_test_dehydrate_idle_anim.anim‎Assets/HoloToolkit/Input/Tests/Animations/button_test_dehydrate_idle_anim.anim renamed to Assets/HoloToolkit-Tests/Input/Animations/button_test_dehydrate_idle_anim.anim b/‎…ons/button_test_dehydrate_idle_anim.anim‎ ‎…ons/button_test_dehydrate_idle_anim.anim‎Assets/HoloToolkit/Input/Tests/Animations/button_test_dehydrate_idle_anim.anim renamed to Assets/HoloToolkit-Tests/Input/Animations/button_test_dehydrate_idle_anim.anim
@@ -32,7 +32,7 @@ obj/
 *.ipch
 *.opensdf
 *.sdf
-*.obj
+#*.obj
 *.tlog
 *.log
 *.idb
-Original file line number
+Diff line change
 *.ipch
 *.opensdf
 *.sdf
 -*.obj
 +#*.obj
 *.tlog
 *.log
 *.idb