Shawn Xie 261e7d7769 Resolve conflicts

2026-04-06 12:11:45 -04:00

..

basics

chore: Enable clang-tidy coreguidelines checks (#6698)

2026-04-01 15:46:14 +00:00

beast

chore: Enable clang-tidy coreguidelines checks (#6698)

2026-04-01 15:46:14 +00:00

conditions

chore: Apply clang-format width 100 (#6387)

2026-02-19 23:30:00 +00:00

core

chore: Enable clang-tidy coreguidelines checks (#6698)

2026-04-01 15:46:14 +00: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

chore: Enable clang-tidy coreguidelines checks (#6698)

2026-04-01 15:46:14 +00:00

ledger

chore: Enable clang-tidy misc checks (#6655)

2026-03-31 17:29:45 +00:00

net

fix: Fix memory leaks in HTTPClient (#6370)

2026-03-16 14:12:48 +00:00

nodestore

chore: Enable clang-tidy coreguidelines checks (#6698)

2026-04-01 15:46:14 +00:00

proto

refactor: Fix spelling issues in tests (#6199)

2026-02-06 20:30:22 +00:00

protocol

Merge remote-tracking branch 'upstream/develop' into ct-merge

2026-04-06 11:57:06 -04:00

protocol_autogen

Resolve conflicts

2026-04-06 12:11:45 -04:00

rdb

chore: Enable clang-tidy coreguidelines checks (#6698)

2026-04-01 15:46:14 +00:00

resource

chore: Enable clang-tidy coreguidelines checks (#6698)

2026-04-01 15:46:14 +00:00

server

chore: Enable clang-tidy coreguidelines checks (#6698)

2026-04-01 15:46:14 +00:00

shamap

chore: Enable clang-tidy misc checks (#6655)

2026-03-31 17:29:45 +00:00

tx

Merge remote-tracking branch 'upstream/develop' into ct-merge

2026-04-06 11:57:06 -04:00