Mateusz Starzyk 17011a3185 Merge branch 'development' into convert_NO_SHA384_to_positive ...

Conflicts:
	library/version_features.c
	programs/test/query_config.c

Files were removed in development branch and modified by current branch.
Conflicts fixes by removing them.

2021-05-20 14:18:12 +02:00

..

data_files

…

mbedtls_dev

…

abi_check.py

…

apidoc_full.sh

…

assemble_changelog.py

…

bump_version.sh

…

config.pl

…

config.py

…

ecc-heap.sh

…

find-mem-leak.cocci

…

footprint.sh

…

generate_errors.pl

…

generate_features.pl

…

generate_psa_constants.py

…

generate_query_config.pl

…

generate_visualc_files.pl

…

make_generated_files.bat

…

massif_max.pl

…

memory.sh

…

output_env.sh

…

rm-calloc-cast.cocci

…

tmp_ignore_makefiles.sh

…

windows_msbuild.bat

…