diff options
| author | Werner Koch <wk@gnupg.org> | 2017-10-27 13:56:15 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2017-10-27 13:56:15 +0200 |
| commit | f6ab97fd9620bb8f512ffb471a66e5f96098a7cc (patch) | |
| tree | 99db33d56ef4f0c05f1d6af6ec7ffaffd9547e1b /m4/ntbtls.m4 | |
| parent | agent: Clean up pinentry access locking. (diff) | |
| parent | agent, tests: Support --disable-scdaemon build case. (diff) | |
| download | gnupg2-f6ab97fd9620bb8f512ffb471a66e5f96098a7cc.tar.xz gnupg2-f6ab97fd9620bb8f512ffb471a66e5f96098a7cc.zip | |
Merge branch 'STABLE-BRANCH-2-2' into master
--
Resolved Conflicts:
configure.ac - Adjust due to new log_clock otions
Diffstat (limited to 'm4/ntbtls.m4')
0 files changed, 0 insertions, 0 deletions