Fixing bad merges still. ENGINE-329
authorKrista Bennett <krista@pep-project.org>
Mon, 29 Jan 2018 12:36:02 +0100
branchENGINE-329
changeset 246248b526a0daac
parent 2460 e4ab0408475d
parent 2461 85c8e5aad3bc
child 2463 c1f2f4a80078
child 2465 9dad4038017f
Fixing bad merges still.
Makefile.conf
src/bloblist.c
src/bloblist.h
src/keymanagement.c
src/keymanagement.h
src/message_api.c
src/pEpEngine.c
src/pEpEngine.h
src/pEp_internal.h
src/pEp_string.c
src/pgp_gpg.c
src/platform_windows.h
src/sync_actions.c
src/sync_impl.c
test/apple_mail_test.cc
test/blacklist_test.cc
test/decorate_test.cc
test/encrypt_missing_private_key_test.cc
test/external_revoke_test.cc
test/least_color_group_test.cc
test/message_api_test.cc
test/new_update_id_and_myself_test.cc
test/revoke_regen_attach_test.cc
test/trust_manipulation_test.cc
test/userid_alias_test.cc
     1.1 --- a/Makefile.conf	Fri Jan 26 16:37:27 2018 +0100
     1.2 +++ b/Makefile.conf	Mon Jan 29 12:36:02 2018 +0100
     1.3 @@ -89,7 +89,7 @@
     1.4  #GPG_CMD:=$(shell gpgconf --list-components | awk -F: '/^gpg:/ { print $$3; exit 0; }')
     1.5  
     1.6  # Selects OpenPGP implementation. must be either `GPG` or `NETPGP`
     1.7 -OPENPGP=NETPGP
     1.8 +OPENPGP=GPG
     1.9  
    1.10  # Path of libGPGME binary
    1.11  #LIBGPGME=libgpgme.so.11