Merge branch '0.4.x' into 0.5.x

Conflicts:
	src/net.cpp
This commit is contained in:
Luke Dashjr
2012-08-12 17:02:38 +00:00
11 changed files with 33 additions and 33 deletions
+1 -1
View File
@@ -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