Skip to content

Fix typos and misc cleanup.#7157

Merged
laanwj merged 7 commits intobitcoin:masterfrom
maflcko:MarcoFalke-2015-trivial6
Dec 2, 2015
Merged

Fix typos and misc cleanup.#7157
laanwj merged 7 commits intobitcoin:masterfrom
maflcko:MarcoFalke-2015-trivial6

Conversation

@maflcko
Copy link
Member

@maflcko maflcko commented Dec 2, 2015

Should fix #7147 (comment)

@maflcko
Copy link
Member Author

maflcko commented Dec 2, 2015

Includes some easy cherry-picks from theuni/trivial. @theuni Are you going to do the actual rebase?

@maflcko maflcko force-pushed the MarcoFalke-2015-trivial6 branch from fa28e4c to fa57495 Compare December 2, 2015 13:09
@laanwj
Copy link
Member

laanwj commented Dec 2, 2015

No translation changes, looks sane to me
ACK

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wladmir :-)

Copy link
Member

@sipa sipa Dec 2, 2015 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@laanwj
Copy link
Member

laanwj commented Dec 2, 2015

May be nice to fix this one (from #6216) in the same go: petertodd@db6047d#commitcomment-14733536

@maflcko maflcko force-pushed the MarcoFalke-2015-trivial6 branch from fa57495 to fabd10a Compare December 2, 2015 14:25
@maflcko
Copy link
Member Author

maflcko commented Dec 2, 2015

Rebased and fixed nit

@laanwj laanwj merged commit fabd10a into bitcoin:master Dec 2, 2015
laanwj added a commit that referenced this pull request Dec 2, 2015
fabd10a Fix typo in wallet.cpp (MarcoFalke)
fad2460 Update contrib/devtools/README.md (MarcoFalke)
5e151a8 PartitionCheck: remove useless spaces (paveljanik)
fad0088 TRIVIAL: Chainparams: Remove unused CBaseUnitTestParams (Jorge Timón)
74f7341 Update miner.cpp: Fix typo in comment (antonio-fr)
e69bad1 [trivial] Fix typo in peertablemodel.cpp (MarcoFalke)
8a03727 Fix various typos (paveljanik)
@maflcko maflcko deleted the MarcoFalke-2015-trivial6 branch December 2, 2015 15:56
luke-jr pushed a commit to luke-jr/bitcoin that referenced this pull request Dec 8, 2015
Github-Pull: bitcoin#7157
Rebased-From: 8a03727
luke-jr pushed a commit to luke-jr/bitcoin that referenced this pull request Dec 8, 2015
luke-jr pushed a commit to luke-jr/bitcoin that referenced this pull request Dec 8, 2015
luke-jr pushed a commit to luke-jr/bitcoin that referenced this pull request Dec 8, 2015
Github-Pull: bitcoin#7157
Rebased-From: 8a03727
luke-jr pushed a commit to luke-jr/bitcoin that referenced this pull request Dec 8, 2015
luke-jr pushed a commit to luke-jr/bitcoin that referenced this pull request Dec 8, 2015
maflcko pushed a commit that referenced this pull request Dec 6, 2018
…tes from upstream

a67d713 [doc] developer-notes.md: point out that UniValue deviates from upstream (Sjors Provoost)

Pull request description:

  While debugging an issue I was somewhat surprised to [learn](#14164 (comment)) that we've moved `src/univalue` from https://github.com/jgarzik/univalue to https://github.com/bitcoin-core/univalue, that these repos are both maintained and they're different.

  The first mention of using the bitcoin-core repo is from late 2015 in #7157. I didn't check when the last common ancestor commit is.

  I couldn't find documentation as to why (these things just happen in open source of course), but at minimum we should make this more clear.

  There's also the following line in `config.ac` that I'm not sure what to do with:
  ```
  AC_INIT([univalue], [1.0.3],
          [http://github.com/jgarzik/univalue/])
  ```

Tree-SHA512: e58105677b5ebe0005772282da4a805fee7dfccacfb1b2686a874517bf46072d1481181f8a8865d25526f6ed9e5fcd55d8d49906bf27cd0f5aefe4f258aa4d63
PastaPastaPasta referenced this pull request in PastaPastaPasta/dash Jul 1, 2021
…e deviates from upstream

a67d713 [doc] developer-notes.md: point out that UniValue deviates from upstream (Sjors Provoost)

Pull request description:

  While debugging an issue I was somewhat surprised to [learn](bitcoin#14164 (comment)) that we've moved `src/univalue` from https://github.com/jgarzik/univalue to https://github.com/bitcoin-core/univalue, that these repos are both maintained and they're different.

  The first mention of using the bitcoin-core repo is from late 2015 in dashpay#7157. I didn't check when the last common ancestor commit is.

  I couldn't find documentation as to why (these things just happen in open source of course), but at minimum we should make this more clear.

  There's also the following line in `config.ac` that I'm not sure what to do with:
  ```
  AC_INIT([univalue], [1.0.3],
          [http://github.com/jgarzik/univalue/])
  ```

Tree-SHA512: e58105677b5ebe0005772282da4a805fee7dfccacfb1b2686a874517bf46072d1481181f8a8865d25526f6ed9e5fcd55d8d49906bf27cd0f5aefe4f258aa4d63
UdjinM6 referenced this pull request in UdjinM6/dash Jul 5, 2021
…e deviates from upstream

a67d713 [doc] developer-notes.md: point out that UniValue deviates from upstream (Sjors Provoost)

Pull request description:

  While debugging an issue I was somewhat surprised to [learn](bitcoin#14164 (comment)) that we've moved `src/univalue` from https://github.com/jgarzik/univalue to https://github.com/bitcoin-core/univalue, that these repos are both maintained and they're different.

  The first mention of using the bitcoin-core repo is from late 2015 in dashpay#7157. I didn't check when the last common ancestor commit is.

  I couldn't find documentation as to why (these things just happen in open source of course), but at minimum we should make this more clear.

  There's also the following line in `config.ac` that I'm not sure what to do with:
  ```
  AC_INIT([univalue], [1.0.3],
          [http://github.com/jgarzik/univalue/])
  ```

Tree-SHA512: e58105677b5ebe0005772282da4a805fee7dfccacfb1b2686a874517bf46072d1481181f8a8865d25526f6ed9e5fcd55d8d49906bf27cd0f5aefe4f258aa4d63
PastaPastaPasta referenced this pull request in PastaPastaPasta/dash Jul 8, 2021
…e deviates from upstream

a67d713 [doc] developer-notes.md: point out that UniValue deviates from upstream (Sjors Provoost)

Pull request description:

  While debugging an issue I was somewhat surprised to [learn](bitcoin#14164 (comment)) that we've moved `src/univalue` from https://github.com/jgarzik/univalue to https://github.com/bitcoin-core/univalue, that these repos are both maintained and they're different.

  The first mention of using the bitcoin-core repo is from late 2015 in dashpay#7157. I didn't check when the last common ancestor commit is.

  I couldn't find documentation as to why (these things just happen in open source of course), but at minimum we should make this more clear.

  There's also the following line in `config.ac` that I'm not sure what to do with:
  ```
  AC_INIT([univalue], [1.0.3],
          [http://github.com/jgarzik/univalue/])
  ```

Tree-SHA512: e58105677b5ebe0005772282da4a805fee7dfccacfb1b2686a874517bf46072d1481181f8a8865d25526f6ed9e5fcd55d8d49906bf27cd0f5aefe4f258aa4d63
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants