yinyiqian1 c53d6aca08 resolve conflicts

2026-04-23 01:05:20 -04:00

..

basics

Revert "Merge develop into ConfidentialTransfer (#6987)" (#7001)

2026-04-22 23:57:01 -04:00

beast

Revert "Merge develop into ConfidentialTransfer (#6987)" (#7001)

2026-04-22 23:57:01 -04:00

conditions

Revert "Merge develop into ConfidentialTransfer (#6987)" (#7001)

2026-04-22 23:57:01 -04:00

core

Revert "Merge develop into ConfidentialTransfer (#6987)" (#7001)

2026-04-22 23:57:01 -04:00

crypto

refactor: Replace include guards by '#pragma once' (#6322)

2026-02-04 09:50:21 -05:00

git

chore: Add Git information compile-time info to only one file (#6464)

2026-03-04 19:45:28 +00:00

json

Revert "Merge develop into ConfidentialTransfer (#6987)" (#7001)

2026-04-22 23:57:01 -04:00

ledger

Revert "Merge develop into ConfidentialTransfer (#6987)" (#7001)

2026-04-22 23:57:01 -04:00

net

chore: Enable clang-tidy modernize checks (#6975)

2026-04-21 15:32:51 +00:00

nodestore

Revert "Merge develop into ConfidentialTransfer (#6987)" (#7001)

2026-04-22 23:57:01 -04:00

proto

refactor: Rename non-functional uses of ripple(d) to xrpl(d) (#6676)

2026-04-07 13:00:17 +00:00

protocol

Merge branch 'develop' into merge-ct2

2026-04-23 00:41:44 -04:00

protocol_autogen

Merge branch 'develop' into merge-ct2

2026-04-23 00:41:44 -04:00

rdb

Revert "Merge develop into ConfidentialTransfer (#6987)" (#7001)

2026-04-22 23:57:01 -04:00

resource

Revert "Merge develop into ConfidentialTransfer (#6987)" (#7001)

2026-04-22 23:57:01 -04:00

server

Revert "Merge develop into ConfidentialTransfer (#6987)" (#7001)

2026-04-22 23:57:01 -04:00

shamap

Revert "Merge develop into ConfidentialTransfer (#6987)" (#7001)

2026-04-22 23:57:01 -04:00

tx

resolve conflicts

2026-04-23 01:05:20 -04:00