merge
authorKrista Bennett <krista@pep-project.org>
Fri, 16 Feb 2018 18:55:19 +0100
changeset 2513985838fa939a
parent 2512 1aa220fdf1c7
parent 2511 cce0790ba787
child 2514 0616c62d04a9
merge
     1.1 --- a/build-mac/pEpEngine.xcodeproj/project.pbxproj	Fri Feb 16 18:53:44 2018 +0100
     1.2 +++ b/build-mac/pEpEngine.xcodeproj/project.pbxproj	Fri Feb 16 18:55:19 2018 +0100
     1.3 @@ -329,8 +329,6 @@
     1.4  		64A826661B455D0800EECAF0 /* platform_unix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = platform_unix.h; path = ../src/platform_unix.h; sourceTree = "<group>"; };
     1.5  		64A826691B455D0800EECAF0 /* platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = platform.h; path = ../src/platform.h; sourceTree = "<group>"; };
     1.6  		64A8266A1B455D0800EECAF0 /* resource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = resource.h; path = ../src/resource.h; sourceTree = "<group>"; };
     1.7 -		64A8266B1B455D0800EECAF0 /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqlite3.c; path = ../src/sqlite3.c; sourceTree = "<group>"; };
     1.8 -		64A8266C1B455D0800EECAF0 /* sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqlite3.h; path = ../src/sqlite3.h; sourceTree = "<group>"; };
     1.9  		64A8266D1B455D0800EECAF0 /* stringlist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stringlist.c; path = ../src/stringlist.c; sourceTree = "<group>"; };
    1.10  		64A8266E1B455D0800EECAF0 /* stringlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = stringlist.h; path = ../src/stringlist.h; sourceTree = "<group>"; };
    1.11  		64A8266F1B455D0800EECAF0 /* stringpair.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stringpair.c; path = ../src/stringpair.c; sourceTree = "<group>"; };
    1.12 @@ -559,8 +557,6 @@
    1.13  				64A826661B455D0800EECAF0 /* platform_unix.h */,
    1.14  				64A826691B455D0800EECAF0 /* platform.h */,
    1.15  				64A8266A1B455D0800EECAF0 /* resource.h */,
    1.16 -				64A8266B1B455D0800EECAF0 /* sqlite3.c */,
    1.17 -				64A8266C1B455D0800EECAF0 /* sqlite3.h */,
    1.18  				64A8266D1B455D0800EECAF0 /* stringlist.c */,
    1.19  				64A8266E1B455D0800EECAF0 /* stringlist.h */,
    1.20  				64A8266F1B455D0800EECAF0 /* stringpair.c */,