Conjure/OuijaMTLGJ2016
6
0
Fork 0
mirror of https://github.com/ConjureETS/OuijaMTLGJ2016.git synced 2026-03-24 10:11:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
OuijaMTLGJ2016/Assets/characters/Source/Animator_controllers
History
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
..
Unity_Free_anims.controller
Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016
2016-01-30 12:59:59 -05:00
Unity_Free_anims.controller.meta
Personnage 3D
2016-01-30 09:21:16 -05:00