Merge branch 'book'

Browse Source

Conflicts:
	src/cpp/ripple/OrderBookDB.cpp
	src/cpp/ripple/OrderBookDB.h
	src/cpp/ripple/Pathfinder.cpp

...

This commit is contained in:

jed

2013-02-05 13:47:25 -08:00

parent 1b2c0b9242 eb27240610

commit e8b17ef082

15 changed files with 263 additions and 19 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

2

src/js/sjcl

Submodule src/js/sjcl updated: dbdef434e7...d04d0bdccd