ada/mochapine64backup
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

changes.

Browse source
This commit is contained in:
shadow8t4 2018-04-10 14:27:15 -05:00
parent 99250b6b4c
commit 517b5ff95a
5 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
MoCha/Assets/Plugins.meta~Stashed changes Normal file
View file

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 36a268db14e08be4586c27503c77855b
folderAsset: yes
timeCreated: 1523388046
licenseType: Free
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

9
MoCha/Assets/Plugins.meta~Stashed changes.meta Normal file
View file

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: a6833ac8a2686c841ac5a1b5b7b9be48
timeCreated: 1523388413
licenseType: Free
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

6
MoCha/Assets/Plugins/Android.meta
View file

@ -1,7 +1,13 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< Updated upstream
guid: 8cd453422b2e32245b54c76a62e2a81e guid: 8cd453422b2e32245b54c76a62e2a81e
folderAsset: yes folderAsset: yes
timeCreated: 1523387294 timeCreated: 1523387294
=======
guid: e306a28a11a4976488ab98bb77d05c1d
folderAsset: yes
timeCreated: 1523388046
>>>>>>> Stashed changes
licenseType: Free licenseType: Free
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

BIN
MoCha/Assets/Prefabs/Canvas.prefab
View file

Binary file not shown.

BIN
MoCha/Assets/Scenes/Main.unity
View file

Binary file not shown.