ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jedmccaleb/NewCoin

Browse Source 
Conflicts:
	src/Transaction.cpp
This commit is contained in:
JoelKatz
2012-10-01 15:22:37 -07:00
parent 79c35f2689 0b49c0dee9
commit 18d3773da4
4 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Transaction.h
View File

@@ -84,8 +84,7 @@ private:
const NewcoinAddress& naPrivateKey,
const uint256& uNickname,
bool bSetOffer,
const STAmount& saMinimumOffer,
const std::vector<unsigned char>& vucSignature);
const STAmount& saMinimumOffer);
Transaction::pointer setOfferCreate(
const NewcoinAddress& naPrivateKey,
@@ -198,8 +197,7 @@ public:
uint32 uSourceTag,
const uint256& uNickname,
bool bSetOffer,
const STAmount& saMinimumOffer,
const std::vector<unsigned char>& vucSignature);
const STAmount& saMinimumOffer);
// Pre-fund password change.
static Transaction::pointer sharedPasswordFund(