aboutsummaryrefslogtreecommitdiff
path: root/src/univalue/lib/univalue.cpp
AgeCommit message (Collapse)Author
2017-09-29Bump univalue and fix json formatting in testsMarcoFalke
This merge commit bumps the univalue subtree and also updates the whitespace for some failing tests.
2016-09-30Merge commit '2ca7faab4205822b06dc2ab2bbda0a9a70fce7e0' into HEADMarcoFalke
2016-09-25Merge commit '3650668cdbbf369dd8f30c8e8eb5bb883325942d' into HEADMarcoFalke
2015-12-02Merge commit '982709199f1b4e9e35211c419a81938f9f1dd4ed' into bitcoinMarcoFalke
2015-10-01Merge commit '2f9f082b5ef3c495c70598ef23383effef675f9a' as 'src/univalue'Jonas Schnelli