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
Showing
1 changed file
with
3 additions
and
1 deletions
... | @@ -68,4 +68,6 @@ crashlytics-build.properties | ... | @@ -68,4 +68,6 @@ crashlytics-build.properties |
68 | 68 | ||
69 | # Temporary auto-generated Android Assets | 69 | # Temporary auto-generated Android Assets |
70 | /[Aa]ssets/[Ss]treamingAssets/aa.meta | 70 | /[Aa]ssets/[Ss]treamingAssets/aa.meta |
71 | -/[Aa]ssets/[Ss]treamingAssets/aa/* | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
71 | +/[Aa]ssets/[Ss]treamingAssets/aa/* | ||
72 | + | ||
73 | +*.meta | ... | ... |
-
Please register or login to post a comment