Merge fixes/packaging into releases/1.0.0rc3

github-for-unity · Jun 1, 2018 · a3934f8 · a3934f8
2 parents af89835 + 6cc72b7
commit a3934f8
Show file tree

Hide file tree

Showing 10 changed files with 258 additions and 261 deletions.
diff --git a/unity/.gitignore b/unity/.gitignore
@@ -1,7 +1,3 @@
-GitHub.Unity.dll*
-GitHub.Unity.pdb*
-GitHub.Unity.mdb*
-
 [Ll]ibrary/
 [Tt]emp/
 [Oo]bj/

diff --git a/unity/PackageProject/.gitignore b/unity/PackageProject/.gitignore
@@ -14,7 +14,5 @@ ProjectVersion.txt
 Library/
 
 // These files come from lib/
-Assets/Plugins/GitHub/Editor/libsfw.bundle.meta
-Assets/Plugins/GitHub/Editor/libsfw.so.meta
 Assets/Plugins/GitHub/Editor/x64/
 Assets/Plugins/GitHub/Editor/x86/
diff --git a/unity/PackageProject/Assets/Default.unity b/unity/PackageProject/Assets/Default.unity
diff --git a/unity/PackageProject/Assets/Default.unity.meta b/unity/PackageProject/Assets/Default.unity.meta
diff --git a/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Unity.dll.mdb.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Unity.dll.mdb.meta
diff --git a/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Unity.dll.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Unity.dll.meta
diff --git a/unity/PackageProject/Assets/[email protected] → ...ets/Plugins/GitHub/Editor/[email protected] b/unity/PackageProject/Assets/[email protected] → ...ets/Plugins/GitHub/Editor/[email protected]
diff --git a/...ackageProject/Assets/[email protected] → ...lugins/GitHub/Editor/[email protected] b/...ackageProject/Assets/[email protected] → ...lugins/GitHub/Editor/[email protected]