Merge remote-tracking branch 'origin/master' into feat/AR_Architecture
# Conflicts: # .gitignore
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@ -77,3 +77,5 @@ crashlytics-build.properties
|
||||
/[Aa]ssets/[Ss]treamingAssets/aa/*
|
||||
|
||||
# End of https://www.toptal.com/developers/gitignore/api/unity
|
||||
|
||||
IOT/docs/doxygen output/*
|
Reference in New Issue
Block a user