Skip to content

Conversation

@theuni
Copy link
Member

@theuni theuni commented Apr 11, 2015

It's been a while now, so here's what's piled up in trivial.

Fwiw, since we dropped the policy on header include order, I'll start NACKing those changes in trivial from this point forward, unless they're necessary for some specific reason. With the current modularization effort that constantly touches includes, they just cause unnecessary merge conflicts.

I'll also be more picky about arbitrary cosmetic changes, as they could ping/pong forever.

Philip Kaufmann and others added 21 commits April 11, 2015 18:13
- seperate core from GUI headers where this was missing
- remove an unneeded new-line
Link to 7.7 is broken.
This additional patch removes '()' from current function name in LogPrintf output.
- 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
- BITCOIN_FOLDER_SUBFOLDER_FILENAME_H
Copy link
Contributor

Choose a reason for hiding this comment

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

one new space before "for old block".

@jgarzik
Copy link
Contributor

jgarzik commented Apr 12, 2015

ACK

@laanwj
Copy link
Member

laanwj commented Apr 13, 2015

I'll also be more picky about arbitrary cosmetic changes, as they could ping/pong forever

Fwiw, since we dropped the policy on header include order, I'll start NACKing those changes in trivial

Indeed.

@laanwj
Copy link
Member

laanwj commented Apr 13, 2015

ACK, apart from @sipa's name

@paveljanik
Copy link
Contributor

ACK (nits: @sipa's name, one additional space)

laanwj added a commit that referenced this pull request Apr 20, 2015
c6de7c3 trivial string change in wallet.cpp (the -> that) (Philip Kaufmann)
1e3473d Add operator names to DNS Seed list (Michael Ford)
a21df62 ensure consistent header comment naming conventions (Philip Kaufmann)
9e16cb1 Make 'Default: %u' spacing consistent in help message (Wladimir J. van der Laan)
6cb37a3 [Qt, Trivial] remove two unneeded includes of wallet/db.h (Philip Kaufmann)
68f795e [Qt, Trivial] fix header groupings + space, intdentation fixes (Philip Kaufmann)
985ec17 [Qt, Trivial] misc minor string changes (Philip Kaufmann)
c0555dc depends: latest config.guess and config.sub (Michael Ford)
89fc6b6 Remove leftover strlcpy.h copyright (Rob Van Mieghem)
468aa3b Re-wrote a passage of text that was difficult to understand. (Jason Lewicki)
71ad6bd [Trivial] format sync.h (Philip Kaufmann)
abcec30 Update REST URL to match reality (paveljanik)
447d37e  Use https link to bitcoin.org in Doxygen intro (Michael Ford)
c069234 Fix typo in init.cpp interpration/interpretation (Michael Ford)
52070c8 Removed '()' where used without contents inside (Nicolas Benoit)
30c1db1 Replaced current function names with __func__ in LogPrintf() calls. (Nicolas Benoit)
9bdd03f Point to the Debian 7.8 installer (Michael Ford)
0b2f930 Fix docs for 'complete' field in 'signrawtransaction' response (charlescharles)
c2f2161 Add x86_64* i686* mips* and arm* to depends .gitignore (Michael Ford)
fa535f9 Remove folder and images for bootstrap.md (sandakersmann)
60c1469 [Qt] header group cleanup (Philip Kaufmann)
@laanwj
Copy link
Member

laanwj commented Apr 20, 2015

Merged via 6a0bcb8, after fixing nits.

@laanwj laanwj closed this Apr 20, 2015
@ayeowch
Copy link
Contributor

ayeowch commented Apr 20, 2015

@laanwj Looks like one nit is missing in the merged commit: seed.bitcoinstats.com is operated by Christian Decker.
6a0bcb8

@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.