mirror of
https://github.com/Xahau/xahaud.git
synced 2026-09-27 15:38:01 +00:00
Raw result of cherry-picking XRPLF/rippled 1506e65558 onto origin/dev
c208a40ce8: 78 files applied clean, 28 in conflict (36 hunks), conflict
markers left in place so the merge is visible. Resolution follows in the
next commit. src/xrpld/rpc/detail/RPCSub.cpp is upstream's copy of a file
xahaud moved to src/xrpld/net/detail/RPCSub.cpp (delete/modify).
(cherry picked from commit 1506e65558818ea73a2233d2a55c1d1441d5fb10)
JSON
Third party library to do JSON operations.