Merge branch 'master' into justine_develop

This commit is contained in:
jventalon 2015-11-19 21:26:27 -05:00
commit 222f6e6d37
3 changed files with 8 additions and 0 deletions

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 84b6e15a0584064428ba8f318da97379
timeCreated: 1447972261
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.