Skip to content

Commit

Permalink
Merge branch 'auxpow'
Browse files Browse the repository at this point in the history
Upstream bitcoin/bitcoin#16426 reversed the lock
order between the wallet and cs_main.  In the name code, we had to
do the same updates in some places.
  • Loading branch information
domob1812 committed May 4, 2020
2 parents 16a50a8 + 0763024 commit 97cd04e
Show file tree
Hide file tree
Showing 87 changed files with 2,079 additions and 717 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ jobs:
FILE_ENV="./ci/test/00_setup_env_i686_centos.sh"
- stage: test
name: 'x86_64 Linux [GOAL: install] [bionic] [previous releases, uses qt5 dev package and some depends packages] [unsigned char]'
name: 'x86_64 Linux [GOAL: install] [bionic] [C++17, previous releases, uses qt5 dev package and some depends packages] [unsigned char]'
env: >-
FILE_ENV="./ci/test/00_setup_env_native_qt5.sh"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ information or see https://opensource.org/licenses/MIT.
Development Process
-------------------

The `master` branch is regularly built and tested, but is not guaranteed to be
The `master` branch is regularly built (see doc/build-*.md for instructions) and tested, but is not guaranteed to be
completely stable. [Tags](https://github.com/namecoin/namecoin-core/tags) are created
regularly to indicate new official, stable release versions of Namecoin Core.

Expand Down
Loading

0 comments on commit 97cd04e

Please sign in to comment.