• 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
..
.idea/.idea.My project/.idea Loading commit data...
.vscode Loading commit data...
Assets Loading commit data...
Packages Loading commit data...
ProjectSettings Loading commit data...
UserSettings Loading commit data...
.vsconfig Loading commit data...
My project.slnx Loading commit data...
create_sciencestreet_structure.sh Loading commit data...