Merge branch 'development' into lite-blocks

xlscoin · Dec 4, 2018 · 21361c9 · 21361c9
2 parents 0836011 + 61d3e40
commit 21361c9
Show file tree

Hide file tree

Showing 124 changed files with 7,608 additions and 781 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,11 @@
 .DS_Store
-/build
+build/
 /tags
 .idea
 .ycm_extra_conf.py
 .ycm_extra_conf.pyc
-Release
-Debug
+build/src/Release
+build/src/Debug
 src/CMakeCache.txt
 src/CMakeFiles/
 src/Makefile

diff --git a/.travis.yml b/.travis.yml
@@ -166,4 +166,3 @@ deploy:
     on:
       repo: turtlecoin/turtlecoin
       all_branches: true
-      condition: "$_DEPLOYABLE = true"