Merge branch upgrade-unity5

thomaschampagne · Feb 24, 2016 · bc85253 · bc85253
2 parents 6632438 + e24be40
commit bc85253
Show file tree

Hide file tree

Showing 803 changed files with 2,802 additions and 133,428 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,6 @@
 /Library/
 /Temp/
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
diff --git a/Assets/Libraries.meta b/Assets/Libraries.meta
diff --git a/Assets/Libraries/NGUI.meta b/Assets/Libraries/NGUI.meta
diff --git a/Assets/Libraries/NGUI/Examples.meta b/Assets/Libraries/NGUI/Examples.meta
diff --git a/Assets/Libraries/NGUI/Examples/Animations.meta b/Assets/Libraries/NGUI/Examples/Animations.meta
diff --git a/Assets/Libraries/NGUI/Examples/Animations/Button.anim b/Assets/Libraries/NGUI/Examples/Animations/Button.anim
diff --git a/Assets/Libraries/NGUI/Examples/Animations/Button.anim.meta b/Assets/Libraries/NGUI/Examples/Animations/Button.anim.meta
diff --git a/Assets/Libraries/NGUI/Examples/Animations/Checkmark.anim b/Assets/Libraries/NGUI/Examples/Animations/Checkmark.anim
diff --git a/Assets/Libraries/NGUI/Examples/Animations/Checkmark.anim.meta b/Assets/Libraries/NGUI/Examples/Animations/Checkmark.anim.meta