Skip to content
Snippets Groups Projects
Select Git revision
  • master default
1 result
Permalink
  • Jordan's avatar
    fb871289
    New animations merge · fb871289
    Jordan authored 
    # Conflicts:
#	Zookeepers Trial/Library/CurrentLayout.dwlt
#	Zookeepers Trial/Library/InspectorExpandedItems.asset
#	Zookeepers Trial/Library/LastSceneManagerSetup.txt
#	Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll
#	Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
#	Zookeepers Trial/Library/assetDatabase3
#	Zookeepers Trial/Library/metadata/00/00000000000000004000000000000000
#	Zookeepers Trial/Library/metadata/00/00000000000000006100000000000000
    fb871289
    History
    New animations merge
    Jordan authored 
    # Conflicts:
#	Zookeepers Trial/Library/CurrentLayout.dwlt
#	Zookeepers Trial/Library/InspectorExpandedItems.asset
#	Zookeepers Trial/Library/LastSceneManagerSetup.txt
#	Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll
#	Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
#	Zookeepers Trial/Library/assetDatabase3
#	Zookeepers Trial/Library/metadata/00/00000000000000004000000000000000
#	Zookeepers Trial/Library/metadata/00/00000000000000006100000000000000