Jam
/
GGJ_2017
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Merge branch 'master' of https://bitbucket.org/JoshuaReason/irontoad

master
Joshua Reason 8 years ago
parent
2e370ec2f0 9d452dca0a
commit
922930cd1f
3 changed files with 23 additions and 0 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +9
    -0
      IronToad_UnityProject/Assets/Sound.meta~HEAD_0
  2. +7
    -0
      IronToad_UnityProject/Assets/Sound/Music.meta
  3. +7
    -0
      IronToad_UnityProject/Assets/Sound/SFX.meta

+ 9
- 0
IronToad_UnityProject/Assets/Sound.meta~HEAD_0 View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: e3b0c439ea6f28c4fb3ce6bc58682b6b
folderAsset: yes
timeCreated: 1485052873
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

+ 7
- 0
IronToad_UnityProject/Assets/Sound/Music.meta View File

@ -1,8 +1,15 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: f58a00a3100922d4288203443c54d1a5
folderAsset: yes
timeCreated: 1485052873
licenseType: Pro
=======
guid: be2c14b0c562c483bbe057367939b479
folderAsset: yes
timeCreated: 1485052376
licenseType: Free
>>>>>>> 497ca195525b3f1160bab1491e71a9a013e118fb
DefaultImporter:
userData:
assetBundleName:

+ 7
- 0
IronToad_UnityProject/Assets/Sound/SFX.meta View File

@ -1,8 +1,15 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: d96f9b1229b84cb41b71f2332674b8e1
folderAsset: yes
timeCreated: 1485052873
licenseType: Pro
=======
guid: bb5698073b8d847298f0287fcfbdd0de
folderAsset: yes
timeCreated: 1485052376
licenseType: Free
>>>>>>> 497ca195525b3f1160bab1491e71a9a013e118fb
DefaultImporter:
userData:
assetBundleName:

Write Preview
Loading…
Cancel
Save