Merge It #6799

pull ghost wants to merge 144 commits into bitcoin:master from theuni:trivial-next changing 15 files +24 −36
  1. ghost commented at 2:15 PM on October 10, 2015: none

    No description provided.

  2. Remove bootstrap.md
    See #5455
    24d37e671d
  3. remove sig_canonical.json and sig_noncanonical.json d1e243acea
  4. Improve gitian build guide
    Point to the Debian 7.7 installer
Fix wording now that we only use a single image
Remove bitcoin checkout steps, they are covered in release-process
    46acba5441
  5. Fix typo - sentence starts with capital letter df990cd831
  6. Fix typo 3edbf4fa5e
  7. Remove whitespaces before double colon in errors and logs 7f1455eb98
  8. Merge remote-tracking branch 'origin/pr/5469' into trivial-next 34cc6ac8c1
  9. Merge remote-tracking branch 'origin/pr/5491' into trivial-next 78bcc1ec13
  10. Merge remote-tracking branch 'origin/pr/5497' into trivial-next
    Conflicts:
	src/main.cpp
    002b02b28a
  11. Merge remote-tracking branch 'origin/pr/5602' into trivial-next 3a8145050b
  12. Merge remote-tracking branch 'origin/pr/5614' into trivial-next 67bff862d0
  13. Merge remote-tracking branch 'origin/pr/5543' into trivial-next 736bc589d6
  14. TRIVIAL: fix misleading comment abbb9d4c57
  15. depends: fix typos 49f2eb76cc
  16. Suggest --disable-wallet when libdb_cxx headers are missing 918db6542f
  17. Merge branch 'depends_typos' of https://github.com/fanquake/bitcoin-trivial into trivial-next 993375199a
  18. Merge remote-tracking branch 'origin/pr/5680' into trivial-next 198735de47
  19. Fix README link from util.sh -> util.py. d201c435c0
  20. fix _code_ snippet in gitian-building.md
    Trivial typo-like fix
    0bc2bdda80
  21. Merge remote-tracking branch 'origin/master' into trivial-next 175ee7fc93
  22. Merge remote-tracking branch 'origin/pr/5692' into trivial-next
    Original PR: https://github.com/bitcoin/bitcoin/pull/5692
    ef6f36deb5
  23. Merge remote-tracking branch 'origin/pr/5702' into trivial-next
    Original PR: https://github.com/bitcoin/bitcoin/pull/5702
    767be48bb9
  24. Merge remote-tracking branch 'origin/pr/5658' into trivial-next
    Original PR: https://github.com/bitcoin/bitcoin/pull/5658
    4450d68cec
  25. [Qt] header group cleanup
    - seperate core from GUI headers where this was missing
- remove an unneeded new-line
    61f76ec396
  26. Changed pronouns for correctness and inclusivity 851941306d
  27. Merge remote-tracking branch 'origin/master' into trivial-next 12b3f13388
  28. Merge remote-tracking branch 'origin/pr/5730' into trivial-next
    Original PR: https://github.com/bitcoin/bitcoin/pull/5730
    96d38aff45
  29. Remove folder and images for bootstrap.md 0afd9d2ac5
  30. Merge remote-tracking branch 'origin/master' into trivial-next 8a833b42a8
  31. Add x86_64* i686* mips* and arm* to depends .gitignore abf84ea27a
  32. Merge pull request #2 from fanquake/depends_gitignore
    Add x86_64* and i686* to depends .gitignore
    0ca9cc5195
  33. Merge remote-tracking branch 'origin/pr/5736' into trivial-next
    Original PR: https://github.com/bitcoin/bitcoin/pull/5736
    79b4cf548c
  34. Fix docs for 'complete' field in 'signrawtransaction' response 81fccd7d82
  35. Point to the Debian 7.8 installer
    Link to 7.7 is broken.
    124e5c5a7f
  36. Merge remote-tracking branch 'origin/master' into trivial-next eca1ba2621
  37. Merge remote-tracking branch 'origin/pr/5723' into trivial-next
    Original PR: https://github.com/bitcoin/bitcoin/pull/5723
    a3cc834ddc
  38. Merge pull request #3 from fanquake/gitian_debian_7_8
    Link to Debian 7.8 in gitian build guide.

Original PR: https://github.com/theuni/bitcoin/pull/3
    cbefc787e5
  39. Merge remote-tracking branch 'origin/master' into trivial-next bbc921c8b9
  40. Merge remote-tracking branch 'origin/pr/5773' into trivial-next
    Original PR: https://github.com/bitcoin/bitcoin/pull/5773
    a4b219466e
  41. Replaced current function names with __func__ in LogPrintf() calls. efe700c28c
  42. Removed '()' where used without contents inside
    This additional patch removes '()' from current function name in LogPrintf output.
    67dee4a8d2
  43. Merge remote-tracking branch 'origin/master' into trivial-next 71ec006f4e
  44. Merge remote-tracking branch 'origin/pr/5823' into trivial-next
    Original PR: https://github.com/bitcoin/bitcoin/pull/5823
    7aa3344e6b
  45. Fix typo in init.cpp interpration/interpretation 2aa19325d7
  46. Use https link to bitcoin.org in Doxygen intro 210e909fca
  47. Merge pull request #4 from fanquake/trivia_typos
    [Trivial] Fix typos

Original PR: https://github.com/theuni/bitcoin/pull/4
    9b7c7d47c8
  48. Update REST URL to match reality dc08debce7
  49. Merge pull request #5 from paveljanik/patch-1
    Update REST URL to match reality.

Original PR: https://github.com/theuni/bitcoin/pull/5
    e688d9edb0
  50. [Trivial] format sync.h e5967bc35e
  51. Re-wrote a passage of text that was difficult to understand. 9ce2cf80d6
  52. Fix typo 10fda4e10b
  53. Remove leftover strlcpy.h copyright
    src/strlcpy.h was removed by https://github.com/bitcoin/bitcoin/commit/6032e4f4e7c1892a4e3f0a1a2007e4cd0fe99937
    45581283d6
  54. Merge remote-tracking branch 'origin/master' into trivial-next
    Conflicts:
	src/main.cpp
    09a95387ba
  55. Merge remote-tracking branch 'origin/pr/5892' into trivial-next
    Original PR: https://github.com/bitcoin/bitcoin/pull/5892
    322409bbec
  56. Merge remote-tracking branch 'origin/pr/5904' into trivial-next
    Original PR: https://github.com/bitcoin/bitcoin/pull/5904
    400bef138a
  57. Merge remote-tracking branch 'origin/pr/5894' into trivial-next
    Original PR: https://github.com/bitcoin/bitcoin/pull/5894
    174cbbde61
  58. Merge remote-tracking branch 'origin/pr/5887' into trivial-next
    Original PR: https://github.com/bitcoin/bitcoin/pull/5887
    b9714257cf
  59. depends: latest config.guess and config.sub d67c929654
  60. [Qt, Trivial] misc minor string changes
    - write "Bitcoins" uppercase
- replace secure/insecure for payment requests with
  authenticated/unauthenticated
- change a translatable string for payment request expiry to match another
  existing string to only get ONE resulting string to translate
    2233463df9
  61. [Qt, Trivial] fix header groupings + space, intdentation fixes 4763e3d58b
  62. [Qt, Trivial] remove two unneeded includes of wallet/db.h 093404f212
  63. Make 'Default: %u' spacing consistent in help message
    Comment by pryds on Transifex.
    86e7c42657
  64. Merge remote-tracking branch 'origin/master' into trivial-next e86116aec1
  65. Merge remote-tracking branch 'theuni/pr/6' into trivial-next
    Original PR: https://github.com/theuni/bitcoin/pull/6
    047fb71a12
  66. Merge remote-tracking branch 'theuni/pr/7' into trivial-next
    Original PR: https://github.com/theuni/bitcoin/pull/7
    c92079bf5b
  67. Merge remote-tracking branch 'theuni/pr/10' into trivial-next
    Original PR: https://github.com/theuni/bitcoin/pull/10
    3e69720eaa
  68. ensure consistent header comment naming conventions
    - BITCOIN_FOLDER_SUBFOLDER_FILENAME_H
- also correct header groupings in core files
    a2c069042d
  69. Add operator names to DNS Seed list 3d0d1f7b6b
  70. addrman: update comments
    nUnkBias was removed in https://github.com/bitcoin/bitcoin/pull/5941
    3c3c4fa518
  71. trivial string change in wallet.cpp (the -> that) 3c49f5c773
  72. Typo in GetRawMemPool RPC method help: "]" --> "}" 903bb6b641
  73. [Trivial] Cryptocurrency is one word
    Cryptocurrency was added to Oxford Dictionaries Online in May 2014.
    8d5d891ca2
  74. Merge remote-tracking branch 'origin/master' into trivial-next 16918ee820
  75. Merge remote-tracking branch 'theuni/pr/8' into trivial-next
    Original PR: https://github.com/theuni/bitcoin/pull/10
    6fcf13254b
  76. Merge remote-tracking branch 'theuni/pr/13' into trivial-next
    Original PR: https://github.com/theuni/bitcoin/pull/13
    baa9edfde1
  77. Merge remote-tracking branch 'theuni/pr/14' into trivial-next
    Original PR: https://github.com/theuni/bitcoin/pull/14
    e0459fd5e7
  78. Revert "Fix typo"
    This reverts commit 10fda4e10bcccf367712d1d36b72685c4865898b.

This wasn't a typo, it's stating "to the end".
    3ff1b15db0
  79. Capitalized P2P
    Capitalized P2P
    251cfa233d
  80. [init] better message when no wallet support is compiled in 1b23d487a2
  81. Trivial: Corrected owner of DNS seeder 7def171f26
  82. Comment edits and cleanup
    Original PR here: https://github.com/bitcoin/bitcoin/pull/6044
    9602ede3a7
  83. [Trivial] Update COPYING
    Corrected header
    415f8e5dac
  84. Merge remote-tracking branch 'origin/master' into trivial-next
    Conflicts:
	src/chainparams.cpp
	src/main.cpp
    38436658ab
  85. Merge remote-tracking branch 'theuni/pr/16' into trivial-next
    Original PR: https://github.com/theuni/bitcoin/pull/16
    d47c1a4c1b
  86. Merge remote-tracking branch 'theuni/pr/18' into trivial-next
    Original PR: https://github.com/theuni/bitcoin/pull/18
    07286646bd
  87. Merge remote-tracking branch 'theuni/pr/19' into trivial-next
    Original PR: https://github.com/theuni/bitcoin/pull/19
    4599a866b9
  88. Merge remote-tracking branch 'origin/pr/5963' into trivial-next
    Original PR: https://github.com/bitcoin/bitcoin/pull/5963
    8eaef1b6f3
  89. Merge remote-tracking branch 'origin/pr/6002' into trivial-next
    Original PR: https://github.com/bitcoin/bitcoin/pull/6002
    05ea836a37
  90. Merge remote-tracking branch 'origin/pr/6003' into trivial-next
    Original PR: https://github.com/bitcoin/bitcoin/pull/6003
    c759a61d07
  91. Merge remote-tracking branch 'origin/pr/6038' into trivial-next
    Original PR: https://github.com/bitcoin/bitcoin/pull/6038
    5bf2cc18b5
  92. fix IDE/compiler warning "extra ';'" in validationinterface.h 2aaebd8eac
  93. remove unused classes from db.h 552072553a
  94. remove unneeded incude of wallet/db.h from rpcmining.cpp fa4b962fcb
  95. fix header include groups d4a4ecc186
  96. Merge remote-tracking branch 'origin/master' into trivial-next
    Conflicts:
	src/addrman.h
    eaa7698fe1
  97. Merge remote-tracking branch 'theuni/pr/11' into trivial-next
    Original PR: https://github.com/theuni/bitcoin/pull/11
    137999b837
  98. Merge remote-tracking branch 'theuni/pr/20' into trivial-next
    Original PR: https://github.com/theuni/bitcoin/pull/20
    9a0348c289
  99. Merge remote-tracking branch 'theuni/pr/21' into trivial-next
    Original PR: https://github.com/theuni/bitcoin/pull/21
    7ddbefe8d5
  100. Merge remote-tracking branch 'theuni/pr/22' into trivial-next
    Original PR: https://github.com/theuni/bitcoin/pull/22
    855f0c6ac6
  101. Alphabetic order in makefile 1e2caa9759
  102. Merge remote-tracking branch 'origin/master' into trivial-next
    Conflicts:
	src/addrman.h
    6dfedd8737
  103. Merge remote-tracking branch 'theuni/pr/23' into trivial-next
    Original PR: https://github.com/theuni/bitcoin/pull/23
    cc8b37a02c
  104. Fix Wladimir's name 91c6fd1009
  105. Refactor: miner.cpp: Move local variable to the smaller scope where its needed c9fd4f7c04
  106. TRIVIAL: Chainparams: Remove unused CBaseUnitTestParams ac1c555f27
  107. TRIVIAL: missing include a15326ae30
  108. Complete listunspent RPC call help message
    Add missing output Array objects, complete description (spendable was not described).
    a3472092cb
  109. Update README.md
    *1000* was getting interpreted as italic instead of multiplication on https://github.com/bitcoin/bitcoin/blob/master/contrib/linearize/README.md
    2978a8a534
  110. Use proper lowercase "k" for kB measurements 7dc50c7f2e
  111. Merge remote-tracking branch 'origin/master' into trivial-next 2a59617e83
  112. Merge pull request #24 from paveljanik/patch-1
    Fix Wladimir's name
    b4e420a24c
  113. Merge pull request #26 from jtimon/trivial_miner
    Refactor: miner.cpp: Move local variable to the smaller scope where i…
    329adc19d3
  114. Merge pull request #27 from jtimon/trivial-unittest-params
    TRIVIAL: Chainparams: Remove unused CBaseUnitTestParams
    a2f74de982
  115. Merge pull request #28 from jtimon/trivial-missing-inlcudes
    Trivial missing inlcudes
    be997831ca
  116. Merge pull request #31 from paveljanik/patch-2
    Complete listunspent RPC call help message
    710cb65b6f
  117. Fix link to Xcode 6.1.1.
    The previous link was broken, and it appears that now, to download, you
need to not only sign in, but have a cookie that's set by loading the main
downloads page.
[skip ci]
    984866d78e
  118. Merge remote-tracking branch 'origin/master' into trivial-next 5b5f390e6d
  119. Merge remote-tracking branch 'origin/pr/6204' into trivial-next
    Original PR: https://github.com/bitcoin/bitcoin/pull/6204
    a43fba7116
  120. Merge remote-tracking branch 'origin/pr/6202' into trivial-next
    Original PR: https://github.com/bitcoin/bitcoin/pull/6202
    dd67fd0913
  121. Merge remote-tracking branch 'origin/pr/6236' into trivial-next
    https://github.com/bitcoin/bitcoin/pull/6236
    e6f66e1621
  122. trivial .gitignore cache/ d39348d131
  123. PartitionCheck: remove useless spaces 68656e818c
  124. Merge pull request #36 from jtimon/trivial-ignore
    trivial ignore cache/ in .gitignore
    a780f87f1f
  125. Merge pull request #37 from paveljanik/patch-3
    PartitionCheck: remove useless spaces
    4c9b156564
  126. Fix typo: readble -> readable 708c1ee4af
  127. remove rawtransaction.py test from "extended" list dee0ce799d
  128. Fix typo d4ad0a3712
  129. Merge pull request #39 from paveljanik/patch-4
    Fix typo: readble -> readable
    2cafb14a28
  130. Merge pull request #40 from jonasschnelli/2015/06/fix_rpc-test-rawtx
    remove rawtransaction.py test from "extended" list
    36d415ba63
  131. Merge pull request #43 from paveljanik/patch-6
    Fix typo
    7d5aecd2c1
  132. Fix typo, reformat comment 8e469ca777
  133. Fix typo in release notes fa38eb6634
  134. fix -prune arg comment; enable wallet is possible now a391284c8d
  135. Revert "Update README.md"
    This reverts commit 2978a8a5341b0b81f4230dae4714459cf9124208.

Superseded in master by e3c42973b2f6fb1ceb277b2681e8ebccd6b588df
    e325ae93d6
  136. Revert "Fix link to Xcode 6.1.1."
    This reverts commit 984866d78ec4771223e506a8540088bd28b8f723.

Superseded by cfc600d833833c8c5effeb10d2b759ba417bf85a in master
    e6ce6f67b8
  137. Merge remote-tracking branch 'origin/master' into trivial-next
    Conflicts:
	src/init.cpp
	src/wallet/rpcwallet.cpp
    1980f1f820
  138. Merge pull request #44 from paveljanik/patch-7
    Fix typo, reformat comment
    c4cf8992e1
  139. Merge pull request #45 from fsb4000/patch-3
    Fix typo in release notes
    6480f52d8d
  140. Merge pull request #46 from jonasschnelli/trivial-next
    fix -prune arg comment; enable wallet is possible now
    8643071725
  141. Merge remote-tracking branch 'origin/master' into trivial-next
    Conflicts:
	src/init.cpp
	src/wallet/rpcwallet.cpp
    58bb6f8731
  142. [Trivial] remove unneeded space in init 98228f762b
  143. [trivial] Fix typo in peertablemodel.cpp 43dfa162c5
  144. Merge pull request #51 from MarcoFalke/MarcoFalke-2015-trivial
    [trivial] Fix typo in peertablemodel.cpp
    e7c0ebad28
  145. Update miner.cpp
    Fix typo in comment
    5036a4ba89
  146. gmaxwell closed this on Oct 10, 2015
  147. MarcoFalke locked this on Sep 8, 2021
Contributors
ghost
github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2026-04-17 15:15 UTC
This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me