sujith cc8d6de0fc Sujith :) -> hace 2 meses
..
MergeActions e03822afb2 Updated git merge modification for selective application hace 2 meses
Resources e03822afb2 Updated git merge modification for selective application hace 2 meses
Utilities ad978c4e3d Added base git merge hace 2 meses
VCS ad978c4e3d Added base git merge hace 2 meses
.DS_Store e03822afb2 Updated git merge modification for selective application hace 2 meses
ConflictWatcher.cs 67f8e8b05d Sujith :) -> hace 2 meses
ConflictWatcher.cs.meta e03822afb2 Updated git merge modification for selective application hace 2 meses
GameObjectMergeActions.cs e03822afb2 Updated git merge modification for selective application hace 2 meses
GameObjectMergeActions.cs.meta ad978c4e3d Added base git merge hace 2 meses
GitMergeWindow.cs cc8d6de0fc Sujith :) -> hace 2 meses
GitMergeWindow.cs.meta ad978c4e3d Added base git merge hace 2 meses
MergeActions.meta ad978c4e3d Added base git merge hace 2 meses
MergeManagerBase.cs e03822afb2 Updated git merge modification for selective application hace 2 meses
MergeManagerBase.cs.meta ad978c4e3d Added base git merge hace 2 meses
MergeManagerPrefab.cs ad978c4e3d Added base git merge hace 2 meses
MergeManagerPrefab.cs.meta ad978c4e3d Added base git merge hace 2 meses
MergeManagerScene.cs c5f760b686 Fixed scene merger hace 2 meses
MergeManagerScene.cs.meta ad978c4e3d Added base git merge hace 2 meses
ObjectDictionaries.cs ad978c4e3d Added base git merge hace 2 meses
ObjectDictionaries.cs.meta ad978c4e3d Added base git merge hace 2 meses
Resources.cs ad978c4e3d Added base git merge hace 2 meses
Resources.cs.meta ad978c4e3d Added base git merge hace 2 meses
Resources.meta ad978c4e3d Added base git merge hace 2 meses
ThirteenPixels.GitMerge.asmdef ad978c4e3d Added base git merge hace 2 meses
ThirteenPixels.GitMerge.asmdef.meta ad978c4e3d Added base git merge hace 2 meses
Utilities.meta ad978c4e3d Added base git merge hace 2 meses
VCS.meta ad978c4e3d Added base git merge hace 2 meses