Gilles Peskine df29868bb6 Merge branch 'pr_1280' into development-proposed ...

Conflict: configs/config-picocoin.h was both edited and removed.
Resolution: removed, since this is the whole point of PR #1280 and the
changes in development are no longer relevant.

2018-02-14 15:49:54 +01:00

..

data_files

Merge branch 'development' into development-restricted

2017-11-28 18:46:09 +01:00

git-scripts

Move the git scripts to correct path

2017-07-27 21:44:34 +01:00

scripts

Merge branch 'pr_1280' into development-proposed

2018-02-14 15:49:54 +01:00

suites

Merge remote-tracking branch 'upstream-public/pr/1333' into development-proposed

2018-02-14 15:12:49 +01:00

.gitignore

Move some ignore patterns to subdirectories

2015-01-28 15:33:23 +00:00

CMakeLists.txt

Support verbose output of the test suites

2017-06-25 11:24:18 +03:00

compat.sh

wait_server_start: warn if lsof is not available

2018-01-22 10:29:24 +01:00

Descriptions.txt

Add selftest program to the list of tests

2014-04-04 16:33:01 +02:00

Makefile

Clean up of formatting, and potential integer overflow fix

2016-10-13 13:51:13 +01:00

ssl-opt.sh

Merge branch 'development' into development-restricted

2018-01-29 12:49:05 +00:00