Merge branch 'pay'

Conflicts:
	src/NetworkOPs.cpp
This commit is contained in:
Arthur Britto
2012-05-27 17:56:45 -07:00
10 changed files with 236 additions and 111 deletions

View File

@@ -96,7 +96,7 @@ bool STAmount::setValue(const std::string& sAmount, const std::string& sCurrency
uint64 uValue;
int iOffset;
size_t uDecimal = sAmount.find_first_of(".,");
size_t uDecimal = sAmount.find_first_of("^");
bool bInteger = uDecimal == std::string::npos;
if (bInteger)