Merge branch 'darrel' into alex

This commit is contained in:
Alex Huddleston 2018-04-18 18:08:45 -05:00
commit 6bc5863f80

2
.gitignore vendored
View file

@ -31,3 +31,5 @@
**/*.apk **/*.apk
**/*.unitypackage **/*.unitypackage
**/UnityPackageManager/ **/UnityPackageManager/
MoCha/Assets/Plugins/Android.meta
MoCha/ProjectSettings/ProjectVersion.txt