merging keysync
authorVolker Birk <vb@pep.foundation>
Thu, 01 Sep 2016 17:55:03 +0200
branchkeysync
changeset 11113c46dc58096d
parent 1110 d37d730fa8e5
parent 1107 ddc7e55256f3
child 1112 5e53bf1e93fb
child 1113 8cda19da7134
merging
     1.1 --- a/build-mac/pEpEngine.xcodeproj/project.pbxproj	Thu Sep 01 17:54:33 2016 +0200
     1.2 +++ b/build-mac/pEpEngine.xcodeproj/project.pbxproj	Thu Sep 01 17:55:03 2016 +0200
     1.3 @@ -935,6 +935,7 @@
     1.4  					"$(SRCROOT)/../../netpgp-et/src/",
     1.5  					"$(SRCROOT)/../../netpgp-et/netpgp-xcode/openssl/include/",
     1.6  					"$(SRCROOT)/../asn.1/",
     1.7 +					"$(SRCROOT)/../../netpgp-et/netpgp-xcode/include/",
     1.8  				);
     1.9  				MTL_ENABLE_DEBUG_INFO = YES;
    1.10  				ONLY_ACTIVE_ARCH = YES;
    1.11 @@ -979,6 +980,7 @@
    1.12  					"$(SRCROOT)/../../netpgp-et/src/",
    1.13  					"$(SRCROOT)/../../netpgp-et/netpgp-xcode/openssl/include/",
    1.14  					"$(SRCROOT)/../asn.1/",
    1.15 +					"$(SRCROOT)/../../netpgp-et/netpgp-xcode/include/",
    1.16  				);
    1.17  				MTL_ENABLE_DEBUG_INFO = NO;
    1.18  				ONLY_ACTIVE_ARCH = NO;