merging sync
authorVolker Birk <vb@pep-project.org>
Fri, 25 Oct 2019 11:08:38 +0200
branchsync
changeset 4133ff662df0bb63
parent 4132 bf7b5f139996
parent 4131 d26c1fba3f86
child 4134 7d55c23d5bd4
child 4136 a167fe720983
merging
     1.1 --- a/build-mac/pEpEngine.xcodeproj/project.pbxproj	Fri Oct 25 11:07:46 2019 +0200
     1.2 +++ b/build-mac/pEpEngine.xcodeproj/project.pbxproj	Fri Oct 25 11:08:38 2019 +0200
     1.3 @@ -149,6 +149,8 @@
     1.4  		43370834203C075A004E6547 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 43370832203C075A004E6547 /* sqlite3.h */; };
     1.5  		438C43B52167752C00C7425B /* labeled_int_list.h in Headers */ = {isa = PBXBuildFile; fileRef = 438C43AF2167752C00C7425B /* labeled_int_list.h */; };
     1.6  		438C43B62167752C00C7425B /* labeled_int_list.c in Sources */ = {isa = PBXBuildFile; fileRef = 438C43B42167752C00C7425B /* labeled_int_list.c */; };
     1.7 +		43E4FBB22362C05600BC01F4 /* NegotiationRequestGrouped.c in Sources */ = {isa = PBXBuildFile; fileRef = 43E4FBAD2362C05600BC01F4 /* NegotiationRequestGrouped.c */; };
     1.8 +		43E4FBB42362C29100BC01F4 /* GroupHandshake.c in Sources */ = {isa = PBXBuildFile; fileRef = 43E4FBB32362C29100BC01F4 /* GroupHandshake.c */; };
     1.9  		43F6921D1F164A47009418F5 /* resource_id.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F6921C1F164A47009418F5 /* resource_id.c */; };
    1.10  		43F73C0B2166282C00AB4524 /* openpgp_compat.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73C032166282C00AB4524 /* openpgp_compat.c */; };
    1.11  		43F73C0D2166282C00AB4524 /* key_reset.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73C052166282C00AB4524 /* key_reset.c */; };
    1.12 @@ -377,6 +379,8 @@
    1.13  		438C43AF2167752C00C7425B /* labeled_int_list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = labeled_int_list.h; path = ../src/labeled_int_list.h; sourceTree = "<group>"; };
    1.14  		438C43B42167752C00C7425B /* labeled_int_list.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = labeled_int_list.c; path = ../src/labeled_int_list.c; sourceTree = "<group>"; };
    1.15  		43D47A8A225CC60600E97C5B /* pEpTrustWords-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "pEpTrustWords-Info.plist"; path = "/Users/dirk/projects/pEp/pEpEngine/build-mac/pEpTrustWords-Info.plist"; sourceTree = "<absolute>"; };
    1.16 +		43E4FBAD2362C05600BC01F4 /* NegotiationRequestGrouped.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = NegotiationRequestGrouped.c; path = ../asn.1/NegotiationRequestGrouped.c; sourceTree = "<group>"; };
    1.17 +		43E4FBB32362C29100BC01F4 /* GroupHandshake.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = GroupHandshake.c; path = ../asn.1/GroupHandshake.c; sourceTree = "<group>"; };
    1.18  		43F6921C1F164A47009418F5 /* resource_id.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = resource_id.c; path = ../src/resource_id.c; sourceTree = "<group>"; };
    1.19  		43F73C032166282C00AB4524 /* openpgp_compat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = openpgp_compat.c; path = ../src/openpgp_compat.c; sourceTree = "<group>"; };
    1.20  		43F73C052166282C00AB4524 /* key_reset.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = key_reset.c; path = ../src/key_reset.c; sourceTree = "<group>"; };
    1.21 @@ -478,6 +482,8 @@
    1.22  		6406CE811CE382F400C14D77 /* asn.1 */ = {
    1.23  			isa = PBXGroup;
    1.24  			children = (
    1.25 +				43E4FBB32362C29100BC01F4 /* GroupHandshake.c */,
    1.26 +				43E4FBAD2362C05600BC01F4 /* NegotiationRequestGrouped.c */,
    1.27  				15B037A822B2B822002D664C /* asn_application.h */,
    1.28  				15B0379A22B2B821002D664C /* asn_codecs_prim.c */,
    1.29  				15B0377022B2B81C002D664C /* asn_codecs_prim.h */,
    1.30 @@ -981,6 +987,7 @@
    1.31  				15B037E322B2B822002D664C /* GroupKeys.c in Sources */,
    1.32  				15B037B122B2B822002D664C /* NegotiationRequest.c in Sources */,
    1.33  				15B037FC22B2B822002D664C /* Hex.c in Sources */,
    1.34 +				43E4FBB22362C05600BC01F4 /* NegotiationRequestGrouped.c in Sources */,
    1.35  				15B0380722B2B822002D664C /* constr_CHOICE.c in Sources */,
    1.36  				15B037B922B2B822002D664C /* NativeEnumerated.c in Sources */,
    1.37  				15B037B022B2B822002D664C /* UTF8String.c in Sources */,
    1.38 @@ -999,6 +1006,7 @@
    1.39  				15B037FB22B2B822002D664C /* Hash.c in Sources */,
    1.40  				154918BB22B940200091B6D6 /* aux_mime_msg.c in Sources */,
    1.41  				15B037CD22B2B822002D664C /* PString.c in Sources */,
    1.42 +				43E4FBB42362C29100BC01F4 /* GroupHandshake.c in Sources */,
    1.43  				15B037F622B2B822002D664C /* Version.c in Sources */,
    1.44  				15B037C622B2B822002D664C /* xer_support.c in Sources */,
    1.45  				15B037EC22B2B822002D664C /* constraints.c in Sources */,