diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:16:40 +0000 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:19:48 +0000 |
commit | cafa8f2879c255c4526709e77b3e42c5b2533b5e (patch) | |
tree | 616fe57c52df382e48341f595871ff43721ea90c /src/base58.h | |
parent | 89c5c381b7e8e29da361e1bf647010ad94e5fea0 (diff) | |
parent | 982f4fd301435e56bb959267a8f69ff793b10e26 (diff) | |
download | bitcoin-cafa8f2879c255c4526709e77b3e42c5b2533b5e.tar.xz |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/key.h
src/keystore.h
src/net.h
src/protocol.cpp
src/qt/guiutil.h
src/test/DoS_tests.cpp
Diffstat (limited to 'src/base58.h')
-rw-r--r-- | src/base58.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/base58.h b/src/base58.h index dff475a746..78cb40f11d 100644 --- a/src/base58.h +++ b/src/base58.h @@ -10,7 +10,7 @@ // could be used to create visually identical looking account numbers. // - A string with non-alphanumeric characters is not as easily accepted as an account number. // - E-mail usually won't line-break if there's no punctuation to break at. -// - Doubleclicking selects the whole number as one word if it's all alphanumeric. +// - Double-clicking selects the whole number as one word if it's all alphanumeric. // #ifndef BITCOIN_BASE58_H #define BITCOIN_BASE58_H |