Patrice Vignola 1cc4ddc40f Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016
Conflicts:
	Assets/characters.meta
	Assets/characters/Source/Animator_controllers/Unity_Free_anims.controller
	Assets/prefabs.meta
	ProjectSettings/ProjectSettings.asset
2016-01-30 12:59:59 -05:00

9 lines
180 B
Plaintext

fileFormatVersion: 2
guid: 44a9bc5b2376b3b4f858f61020f4ec2f
timeCreated: 1454175515
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant: