Merge pull request #79 from SophiaTX/develop

Rebase master
SophiaTX · Jul 25, 2018 · 3510a40 · 3510a40
2 parents 9af0627 + 52da0f9
commit 3510a40
Show file tree

Hide file tree

Showing 546 changed files with 101,953 additions and 46,880 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,6 @@
+.idea
+libraries/manifest/sophiatx_manifest/__pycache__/
+cmake-build-debug
+CMakeCache.txt
+CMakeFiles
+*.user