• saad's avatar
    Merge remote-tracking branch 'origin/CS' into pt_TF · b78861cb
    saad authored
    # Conflicts:
    #	My project/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
    #	My project/ProjectSettings/ProjectSettings.asset
    #	My project/UserSettings/EditorUserSettings.asset
    #	My project/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
    #	My project/UserSettings/Layouts/default-6000.dwlt
    b78861cb
Name
Last commit
Last update
..
Materials Loading commit data...
Models Loading commit data...
Prefabs Loading commit data...
Scenes Loading commit data...
Shaders Loading commit data...
Textures Loading commit data...
_Shaders Loading commit data...
Materials.meta Loading commit data...
Models.meta Loading commit data...
Prefabs.meta Loading commit data...
Scenes.meta Loading commit data...
Shaders.meta Loading commit data...
Textures.meta Loading commit data...
_Shaders.meta Loading commit data...