• saad's avatar
    Merge branch 'mcq_edit' into pt_CS_saad · 7b654ffa
    saad authored
    # Conflicts:
    #	My project/Assets/Prefabs/CS/Canvas.prefab
    #	My project/Assets/ScienceStreet/CS/Scripts/CsUIManager.cs
    #	My project/Assets/WebGLTemplates.meta
    #	My project/Assets/WebGLTemplates/InteractiveVideo/Logo.png
    #	My project/Assets/WebGLTemplates/InteractiveVideo/index.html
    #	My project/Assets/WebGLTemplates/InteractiveVideo/index.html.meta
    #	My project/UserSettings/EditorUserSettings.asset
    #	My project/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
    #	My project/UserSettings/Layouts/default-6000.dwlt
    7b654ffa
Name
Last commit
Last update
..
CS Loading commit data...
MCQ Loading commit data...
TF Loading commit data...
CS.meta Loading commit data...
MCQ.meta Loading commit data...
SampleScene.unity Loading commit data...
SampleScene.unity.meta Loading commit data...
TF.meta Loading commit data...