Merge branch 'ripple'

Browse Source

Conflicts:
	src/TransactionEngine.cpp

...

This commit is contained in:

Arthur Britto

2012-07-17 13:32:29 -07:00

parent 024a8b6433 fcd13d0208

commit aa1f2d3c6a

10 changed files with 573 additions and 518 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

904

src/TransactionEngine.cpp

File diff suppressed because it is too large Load Diff