Merge branch 'master' into kinect

# Conflicts: # sourcecode/capstone/.gitignore # sourcecode/capstone/Assets/Scenes/humanoid.unity # sourcecode/capstone/Assets/Script/Move.cs # sourcecode/capstone/Assets/Script/MoveTrainner.cs # sourcecode/capstone/Packages/manifest.json

Merge branch 'master' into kinect
# Conflicts: # sourcecode/capstone/.gitignore # sourcecode/capstone/Assets/Scenes/humanoid.unity # sourcecode/capstone/Assets/Script/Move.cs # sourcecode/capstone/Assets/Script/MoveTrainner.cs # sourcecode/capstone/Packages/manifest.json
김다솜
Commit c576320a221e19a88a96c1cbd8020ecde89b1dda c576320a 2 parents 6de42bdf 415a8f34
Showing 1 changed file with 2 additions and 0 deletions
.gitignore
--- a/.gitignore
View file @c576320
+++ b/.gitignore
View file @c576320
@@ -69,3 +69,5 @@ crashlytics-build.properties
 # Temporary auto-generated Android Assets
 /[Aa]ssets/[Ss]treamingAssets/aa.meta
 /[Aa]ssets/[Ss]treamingAssets/aa/*
+
+*.meta