• 18손재민's avatar
    Merge remote-tracking branch 'origin/BS' · ec3bda99
    18손재민 authored
    # Conflicts:
    #	Assets/Data.meta
    #	Assets/Models/Animation.meta
    #	Assets/Prefabs/UIs.meta
    #	Assets/Scripts/Interactors/Mannequin.cs
    #	Assets/Scripts/PlayerController.cs
    ec3bda99
Name
Last commit
Last update
..
BSDummy Loading commit data...
SampleScene Loading commit data...
BSDummy.meta Loading commit data...
BSDummy.unity Loading commit data...
BSDummy.unity.meta Loading commit data...
MapEditor.unity Loading commit data...
MapEditor.unity.meta Loading commit data...
ModelScene.meta Loading commit data...
ModelScene.unity Loading commit data...
ModelScene.unity.meta Loading commit data...
SampleScene.meta Loading commit data...
SampleScene.unity Loading commit data...
SampleScene.unity.meta Loading commit data...