Gregory Tsipenyuk 488a736019 Resolve merge conflicts

2026-07-13 09:59:23 -04:00

..

basics

style: Unify style for all Doxygen comments (#7776)

2026-07-13 10:40:40 +00:00

beast

style: Unify style for all Doxygen comments (#7776)

2026-07-13 10:40:40 +00:00

conditions

style: Unify style for all Doxygen comments (#7776)

2026-07-13 10:40:40 +00:00

config

style: Unify style for all Doxygen comments (#7776)

2026-07-13 10:40:40 +00:00

core

style: Unify style for all Doxygen comments (#7776)

2026-07-13 10:40:40 +00:00

crypto

style: Unify style for all Doxygen comments (#7776)

2026-07-13 10:40:40 +00:00

git

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

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

json

style: Unify style for all Doxygen comments (#7776)

2026-07-13 10:40:40 +00:00

ledger

Resolve merge conflicts

2026-07-13 09:59:23 -04:00

net

style: Unify style for all Doxygen comments (#7776)

2026-07-13 10:40:40 +00:00

nodestore

style: Unify style for all Doxygen comments (#7776)

2026-07-13 10:40:40 +00:00

proto

build: Add verify-headers target to cleanup headers (#7670)

2026-07-01 23:14:17 +00:00

protocol

Merge branch 'develop' into gregtatcam/mpt/audit-attackathon-fixes

2026-07-13 09:57:58 -04:00

protocol_autogen

style: Unify style for all Doxygen comments (#7776)

2026-07-13 10:40:40 +00:00

rdb

style: Unify style for all Doxygen comments (#7776)

2026-07-13 10:40:40 +00:00

resource

style: Unify style for all Doxygen comments (#7776)

2026-07-13 10:40:40 +00:00

server

style: Unify style for all Doxygen comments (#7776)

2026-07-13 10:40:40 +00:00

shamap

style: Unify style for all Doxygen comments (#7776)

2026-07-13 10:40:40 +00:00

tx

Merge branch 'develop' into gregtatcam/mpt/audit-attackathon-fixes

2026-07-13 09:57:58 -04:00