Trying to solve this merge....

robertohuertasm · Apr 3, 2015 · fc3fc04 · fc3fc04
1 parent 1d30f20
commit fc3fc04
Show file tree

Hide file tree

Showing 86 changed files with 1 addition and 10,865 deletions.
diff --git a/SQLite4Unity3d/.gitignore → .gitignore b/SQLite4Unity3d/.gitignore → .gitignore
@@ -2,6 +2,7 @@ Example/BUILDS/*
 Example/Library/*
 Example/obj/*
 Example/ProjectSettings/*
+Example_unity5/*
 SQLite4Unity3d/SQLite4Unity3d/bin/
 SQLite4Unity3d/SQLite4Unity3d/obj/
 SQLite4Unity3d/SQLite4Unity3dWP8/bin/

diff --git a/SQLite4Unity3d/LICENSE → LICENSE b/SQLite4Unity3d/LICENSE → LICENSE
diff --git a/SQLite4Unity3d/Plugins.zip → Plugins.zip b/SQLite4Unity3d/Plugins.zip → Plugins.zip
diff --git a/...ns/Android/libs/armeabi-v7a/libsqlite3.so → ...ns/Android/libs/armeabi-v7a/libsqlite3.so b/...ns/Android/libs/armeabi-v7a/libsqlite3.so → ...ns/Android/libs/armeabi-v7a/libsqlite3.so
diff --git a/...ts/Plugins/Android/libs/x86/libsqlite3.so → Plugins/Android/libs/x86/libsqlite3.so b/...ts/Plugins/Android/libs/x86/libsqlite3.so → Plugins/Android/libs/x86/libsqlite3.so
diff --git a/...nity4x/Assets/Plugins/iOS/x64/sqlite3.dll → Plugins/x64/sqlite3.dll b/...nity4x/Assets/Plugins/iOS/x64/sqlite3.dll → Plugins/x64/sqlite3.dll
diff --git a/...nity4x/Assets/Plugins/iOS/x86/sqlite3.dll → Plugins/x86/sqlite3.dll b/...nity4x/Assets/Plugins/iOS/x86/sqlite3.dll → Plugins/x86/sqlite3.dll
diff --git a/SQLite4Unity3d/README.md → README.md b/SQLite4Unity3d/README.md → README.md
diff --git a/SQLite4Unity3d/Example_unity4x/Assets/Plugins/SQLite4Unity3d.dll b/SQLite4Unity3d/Example_unity4x/Assets/Plugins/SQLite4Unity3d.dll
diff --git a/SQLite4Unity3d/Example_unity4x/Assets/Plugins/WP8/ARM/SQLite4Unity3d.dll b/SQLite4Unity3d/Example_unity4x/Assets/Plugins/WP8/ARM/SQLite4Unity3d.dll
diff --git a/SQLite4Unity3d/Example_unity4x/Assets/Plugins/WP8/ARM/Sqlite.dll b/SQLite4Unity3d/Example_unity4x/Assets/Plugins/WP8/ARM/Sqlite.dll
diff --git a/SQLite4Unity3d/Example_unity4x/Assets/Plugins/WP8/ARM/Sqlite.winmd b/SQLite4Unity3d/Example_unity4x/Assets/Plugins/WP8/ARM/Sqlite.winmd
diff --git a/SQLite4Unity3d/Example_unity4x/Assets/Plugins/WP8/README.txt b/SQLite4Unity3d/Example_unity4x/Assets/Plugins/WP8/README.txt
diff --git a/SQLite4Unity3d/Example_unity4x/Assets/Plugins/WP8/x86/SQLite4Unity3d.dll b/SQLite4Unity3d/Example_unity4x/Assets/Plugins/WP8/x86/SQLite4Unity3d.dll
diff --git a/SQLite4Unity3d/Example_unity4x/Assets/Plugins/WP8/x86/Sqlite.dll b/SQLite4Unity3d/Example_unity4x/Assets/Plugins/WP8/x86/Sqlite.dll
diff --git a/SQLite4Unity3d/Example_unity4x/Assets/Plugins/WP8/x86/Sqlite.winmd b/SQLite4Unity3d/Example_unity4x/Assets/Plugins/WP8/x86/Sqlite.winmd
diff --git a/SQLite4Unity3d/Example_unity4x/Assets/Scenes/CreateDBFromScript.unity b/SQLite4Unity3d/Example_unity4x/Assets/Scenes/CreateDBFromScript.unity
diff --git a/SQLite4Unity3d/Example_unity4x/Assets/Scenes/ExistingDBScript.unity b/SQLite4Unity3d/Example_unity4x/Assets/Scenes/ExistingDBScript.unity
diff --git a/SQLite4Unity3d/Example_unity4x/Assets/Scripts/CreateDBScript.cs b/SQLite4Unity3d/Example_unity4x/Assets/Scripts/CreateDBScript.cs
diff --git a/SQLite4Unity3d/Example_unity4x/Assets/Scripts/DataService.cs b/SQLite4Unity3d/Example_unity4x/Assets/Scripts/DataService.cs
diff --git a/SQLite4Unity3d/Example_unity4x/Assets/Scripts/ExistingDBScript.cs b/SQLite4Unity3d/Example_unity4x/Assets/Scripts/ExistingDBScript.cs
diff --git a/SQLite4Unity3d/Example_unity4x/Assets/Scripts/Person.cs b/SQLite4Unity3d/Example_unity4x/Assets/Scripts/Person.cs
diff --git a/SQLite4Unity3d/Example_unity5/.DS_Store b/SQLite4Unity3d/Example_unity5/.DS_Store
diff --git a/SQLite4Unity3d/Example_unity5/Assets/Plugins/Android/libs/armeabi-v7a/libsqlite3.so b/SQLite4Unity3d/Example_unity5/Assets/Plugins/Android/libs/armeabi-v7a/libsqlite3.so
diff --git a/SQLite4Unity3d/Example_unity5/Assets/Plugins/Android/libs/x86/libsqlite3.so b/SQLite4Unity3d/Example_unity5/Assets/Plugins/Android/libs/x86/libsqlite3.so
diff --git a/SQLite4Unity3d/Example_unity5/Assets/Plugins/SQLite4Unity3d.dll b/SQLite4Unity3d/Example_unity5/Assets/Plugins/SQLite4Unity3d.dll
diff --git a/SQLite4Unity3d/Example_unity5/Assets/Plugins/WP8/ARM/SQLite4Unity3d.dll b/SQLite4Unity3d/Example_unity5/Assets/Plugins/WP8/ARM/SQLite4Unity3d.dll
diff --git a/SQLite4Unity3d/Example_unity5/Assets/Plugins/WP8/ARM/Sqlite.dll b/SQLite4Unity3d/Example_unity5/Assets/Plugins/WP8/ARM/Sqlite.dll
diff --git a/SQLite4Unity3d/Example_unity5/Assets/Plugins/WP8/ARM/Sqlite.winmd b/SQLite4Unity3d/Example_unity5/Assets/Plugins/WP8/ARM/Sqlite.winmd
diff --git a/SQLite4Unity3d/Example_unity5/Assets/Plugins/WP8/README_Unity_4x.txt b/SQLite4Unity3d/Example_unity5/Assets/Plugins/WP8/README_Unity_4x.txt
diff --git a/SQLite4Unity3d/Example_unity5/Assets/Plugins/WP8/README_Unity_5.txt b/SQLite4Unity3d/Example_unity5/Assets/Plugins/WP8/README_Unity_5.txt
diff --git a/SQLite4Unity3d/Example_unity5/Assets/Plugins/WP8/x86/SQLite4Unity3d.dll b/SQLite4Unity3d/Example_unity5/Assets/Plugins/WP8/x86/SQLite4Unity3d.dll
diff --git a/SQLite4Unity3d/Example_unity5/Assets/Plugins/WP8/x86/Sqlite.dll b/SQLite4Unity3d/Example_unity5/Assets/Plugins/WP8/x86/Sqlite.dll
diff --git a/SQLite4Unity3d/Example_unity5/Assets/Plugins/WP8/x86/Sqlite.winmd b/SQLite4Unity3d/Example_unity5/Assets/Plugins/WP8/x86/Sqlite.winmd
diff --git a/SQLite4Unity3d/Example_unity5/Assets/Plugins/x64/sqlite3.dll b/SQLite4Unity3d/Example_unity5/Assets/Plugins/x64/sqlite3.dll
diff --git a/SQLite4Unity3d/Example_unity5/Assets/Plugins/x86/sqlite3.dll b/SQLite4Unity3d/Example_unity5/Assets/Plugins/x86/sqlite3.dll
diff --git a/SQLite4Unity3d/Example_unity5/Assets/Scenes/CreateDBFromScript.unity b/SQLite4Unity3d/Example_unity5/Assets/Scenes/CreateDBFromScript.unity
diff --git a/SQLite4Unity3d/Example_unity5/Assets/Scenes/ExistingDBScript.unity b/SQLite4Unity3d/Example_unity5/Assets/Scenes/ExistingDBScript.unity
diff --git a/SQLite4Unity3d/Example_unity5/Assets/Scripts/CreateDBScript.cs b/SQLite4Unity3d/Example_unity5/Assets/Scripts/CreateDBScript.cs