Skip to content

Commit

Permalink
Rebase Vertcoin Core to upstream Bitcoin Core 0.18.1
Browse files Browse the repository at this point in the history
Vertcoin Core 0.15.98, which is Bitcoin Core 0.18.1 merged with Vertcoin Core 0.14.0 to create 0.15.0
  • Loading branch information
metalicjames authored Sep 1, 2019
2 parents a35a84b + 3103980 commit b45f3e2
Show file tree
Hide file tree
Showing 1,111 changed files with 106,569 additions and 67,067 deletions.
17 changes: 13 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
*.tar.gz

*.exe
src/bitcoin
src/bitcoind
src/bitcoin-cli
src/bitcoin-tx
src/vertcoin
src/vertcoind
src/vertcoin-cli
src/vertcoin-tx
src/vertcoin-wallet
src/test/test_bitcoin
src/test/test_bitcoin_fuzzy
src/qt/test/test_bitcoin-qt
Expand Down Expand Up @@ -65,6 +66,7 @@ src/qt/bitcoin-qt.includes
*.a
*.pb.cc
*.pb.h
*.dat

*.log
*.trs
Expand Down Expand Up @@ -116,3 +118,10 @@ test/cache/*

libbitcoinconsensus.pc
contrib/devtools/split-debug.sh

# Output from running db4 installation
db4/

# clang-check
*.plist
.vscode/settings.json
1 change: 1 addition & 0 deletions .python-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.5.6
86 changes: 0 additions & 86 deletions .travis.yml

This file was deleted.

7 changes: 0 additions & 7 deletions .tx/config

This file was deleted.

Loading

0 comments on commit b45f3e2

Please sign in to comment.