Merge branch '2014_univalue_warn' into merge-PR4715

Merge pull request #4715
This commit is contained in:
Jeff Garzik
2014-08-19 00:49:31 -04:00
5 changed files with 344 additions and 20 deletions

View File

@@ -185,6 +185,7 @@ univalue_libbitcoin_univalue_a_SOURCES = \
univalue/univalue.cpp \
univalue/univalue_read.cpp \
univalue/univalue_write.cpp \
univalue/univalue_escapes.h \
univalue/univalue.h
# common: shared between bitcoind, and bitcoin-qt and non-server tools