| .. |
|
MergeActions
|
e03822afb2
Updated git merge modification for selective application
|
1 month ago |
|
Resources
|
e03822afb2
Updated git merge modification for selective application
|
1 month ago |
|
Utilities
|
ad978c4e3d
Added base git merge
|
1 month ago |
|
VCS
|
ad978c4e3d
Added base git merge
|
1 month ago |
|
.DS_Store
|
e03822afb2
Updated git merge modification for selective application
|
1 month ago |
|
ConflictWatcher.cs
|
a168c6dc96
Conflict watcher updated
|
1 month ago |
|
ConflictWatcher.cs.meta
|
e03822afb2
Updated git merge modification for selective application
|
1 month ago |
|
GameObjectMergeActions.cs
|
e03822afb2
Updated git merge modification for selective application
|
1 month ago |
|
GameObjectMergeActions.cs.meta
|
ad978c4e3d
Added base git merge
|
1 month ago |
|
GitMergeWindow.cs
|
e03822afb2
Updated git merge modification for selective application
|
1 month ago |
|
GitMergeWindow.cs.meta
|
ad978c4e3d
Added base git merge
|
1 month ago |
|
MergeActions.meta
|
ad978c4e3d
Added base git merge
|
1 month ago |
|
MergeManagerBase.cs
|
e03822afb2
Updated git merge modification for selective application
|
1 month ago |
|
MergeManagerBase.cs.meta
|
ad978c4e3d
Added base git merge
|
1 month ago |
|
MergeManagerPrefab.cs
|
ad978c4e3d
Added base git merge
|
1 month ago |
|
MergeManagerPrefab.cs.meta
|
ad978c4e3d
Added base git merge
|
1 month ago |
|
MergeManagerScene.cs
|
ad978c4e3d
Added base git merge
|
1 month ago |
|
MergeManagerScene.cs.meta
|
ad978c4e3d
Added base git merge
|
1 month ago |
|
ObjectDictionaries.cs
|
ad978c4e3d
Added base git merge
|
1 month ago |
|
ObjectDictionaries.cs.meta
|
ad978c4e3d
Added base git merge
|
1 month ago |
|
Resources.cs
|
ad978c4e3d
Added base git merge
|
1 month ago |
|
Resources.cs.meta
|
ad978c4e3d
Added base git merge
|
1 month ago |
|
Resources.meta
|
ad978c4e3d
Added base git merge
|
1 month ago |
|
ThirteenPixels.GitMerge.asmdef
|
ad978c4e3d
Added base git merge
|
1 month ago |
|
ThirteenPixels.GitMerge.asmdef.meta
|
ad978c4e3d
Added base git merge
|
1 month ago |
|
Utilities.meta
|
ad978c4e3d
Added base git merge
|
1 month ago |
|
VCS.meta
|
ad978c4e3d
Added base git merge
|
1 month ago |
Syed zainul abedin
a168c6dc96
Conflict watcher updated