Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

Merge branch 'develop' into release

Browse source
This commit is contained in:
sowle 2024-07-11 13:50:11 +02:00
commit 337e88254e
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/epee/include/serialization/keyvalue_helpers.h
View file

@ -105,7 +105,7 @@ namespace epee
std::string res;
for (const auto& item : a)
{
res += epee::string_tools::pod_to_hex(a) + ", ";
res += epee::string_tools::pod_to_hex(item) + ", ";
}
if (a.size())
{

2
src/gui/qt-daemon/layout

@ -1 +1 @@
Subproject commit 91e7fb00d8fb3808f0b435bfecc1b8a650211fbd
Subproject commit 2fb143cc67280f0e0cfcd3165e1c087ba8279edf

2
src/version.h.in
View file

@ -8,6 +8,6 @@
#define PROJECT_REVISION "0"
#define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION
#define PROJECT_VERSION_BUILD_NO 331
#define PROJECT_VERSION_BUILD_NO 332
#define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO)
#define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]"