[Pkg-bitcoin-commits] [libunivalue] 17/76: Merge pull request #1 from jonasschnelli/2015/08/sync_bitcoin

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository libunivalue.

commit 90680559a60a5905443db4185a85007c810bae85
Merge: 7f52cc1 d0ec6ad
Author: Jeff Garzik <jgarzik at bitpay.com>
Date:   Thu Aug 20 14:27:46 2015 -0400

    Merge pull request #1 from jonasschnelli/2015/08/sync_bitcoin
    
    sync with bitcoin/src/univalue

 Makefile.am        |   5 +-
 gen.cpp            |  77 ++++++++++++++++
 numberparse.cpp    |  66 ++++++++++++++
 numberparse.h      |  18 ++++
 univalue.cpp       | 250 ++++++++++++++++++++++++++++++++++++++++++--------
 univalue.h         | 218 ++++++++++++++++++++++++++++++++++++++------
 univalue_escapes.h | 262 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 univalue_read.cpp  | 128 ++++++++++++--------------
 univalue_write.cpp |  67 +++++---------
 9 files changed, 909 insertions(+), 182 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/libunivalue.git