Skip to content

Commit

Permalink
Merge branch 'feature-20141029-master-preparation'
Browse files Browse the repository at this point in the history
  • Loading branch information
@SergioOpenPeer
SergioOpenPeer committed Nov 3, 2014
2 parents c40b864 + 55798b8 commit 967eb8a
Showing 1 changed file with 22 additions and 18 deletions.
40 changes: 22 additions & 18 deletions Samples/OpenPeerSampleApp/OpenPeerSampleApp.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,12 @@
8758C5F41978454800CB8099 /* iPhone_tabBar_favorites_inactive@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8758C5F01978454800CB8099 /* iPhone_tabBar_favorites_inactive@2x.png */; };
875CD7E2167A14810037396B /* SessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 875CD7E1167A14810037396B /* SessionManager.m */; };
875CD7E5167A14960037396B /* Session.m in Sources */ = {isa = PBXBuildFile; fileRef = 875CD7E4167A14960037396B /* Session.m */; };
8766E8C21A07F6D1007384C5 /* boost.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8766E8C01A07F6D1007384C5 /* boost.a */; };
8766E8C31A07F6D1007384C5 /* boost.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8766E8C01A07F6D1007384C5 /* boost.a */; };
8766E8C41A07F6D1007384C5 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8766E8C11A07F6D1007384C5 /* libcurl.a */; };
8766E8C51A07F6D1007384C5 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8766E8C11A07F6D1007384C5 /* libcurl.a */; };
8766E8C71A07F6ED007384C5 /* OpenpeerDataModel.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 8766E8C61A07F6ED007384C5 /* OpenpeerDataModel.bundle */; };
8766E8C81A07F6ED007384C5 /* OpenpeerDataModel.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 8766E8C61A07F6ED007384C5 /* OpenpeerDataModel.bundle */; };
876CBCBB16F20A88004D542B /* IdentityDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 876CBCBA16F20A88004D542B /* IdentityDelegate.m */; };
876CD4C918A38B370069C296 /* CustomerSpecific.plist in Resources */ = {isa = PBXBuildFile; fileRef = 876CD4C818A38B370069C296 /* CustomerSpecific.plist */; };
876CD4CA18A3BAFA0069C296 /* DefaultSettings.plist in Resources */ = {isa = PBXBuildFile; fileRef = 877038E518A24774000B7AA1 /* DefaultSettings.plist */; };
Expand Down Expand Up @@ -280,14 +286,8 @@
87A1086A1802C116001F705D /* Logger.m in Sources */ = {isa = PBXBuildFile; fileRef = 87A108691802C116001F705D /* Logger.m */; };
87A1086C1802CBDC001F705D /* logger.png in Resources */ = {isa = PBXBuildFile; fileRef = 87A1086B1802CBDC001F705D /* logger.png */; };
87A1086E1802CD92001F705D /* logger@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 87A1086D1802CD92001F705D /* logger@2x.png */; };
87A1F57F19A26AF60054A6B8 /* boost.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 87A1F57D19A26AF60054A6B8 /* boost.a */; };
87A1F58019A26AF60054A6B8 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 87A1F57E19A26AF60054A6B8 /* libcurl.a */; };
87A1F58319A26B370054A6B8 /* OpenpeerDataModel.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 87A1F58219A26B370054A6B8 /* OpenpeerDataModel.bundle */; };
87A1F58519A26C130054A6B8 /* OpenPeerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 87A1F58419A26C130054A6B8 /* OpenPeerSDK.framework */; };
87A1F58619A26D8F0054A6B8 /* OpenPeerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 87A1F58419A26C130054A6B8 /* OpenPeerSDK.framework */; };
87A1F58719A26DAF0054A6B8 /* boost.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 87A1F57D19A26AF60054A6B8 /* boost.a */; };
87A1F58819A26DAF0054A6B8 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 87A1F57E19A26AF60054A6B8 /* libcurl.a */; };
87A1F58919A26DB20054A6B8 /* OpenpeerDataModel.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 87A1F58219A26B370054A6B8 /* OpenpeerDataModel.bundle */; };
87A73518193D00F700769011 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 874B135B1935F96800993F8D /* AudioToolbox.framework */; };
87A73519193D078A00769011 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 87D4BDF518683B38008C2D30 /* SystemConfiguration.framework */; };
87B541D11897E2440038D427 /* QRScannerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 872D7E9C1897E19A005D8335 /* QRScannerViewController.m */; };
Expand Down Expand Up @@ -878,6 +878,9 @@
875CD7E1167A14810037396B /* SessionManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SessionManager.m; sourceTree = "<group>"; };
875CD7E3167A14960037396B /* Session.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Session.h; sourceTree = "<group>"; };
875CD7E4167A14960037396B /* Session.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Session.m; sourceTree = "<group>"; };
8766E8C01A07F6D1007384C5 /* boost.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = boost.a; path = ../../OpenPeerSDK.framework/Versions/D/Libraries/boost.a; sourceTree = SOURCE_ROOT; };
8766E8C11A07F6D1007384C5 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../../OpenPeerSDK.framework/Versions/D/Libraries/libcurl.a; sourceTree = SOURCE_ROOT; };
8766E8C61A07F6ED007384C5 /* OpenpeerDataModel.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = OpenpeerDataModel.bundle; path = ../../OpenPeerSDK.framework/Versions/D/Resources/OpenpeerDataModel.bundle; sourceTree = SOURCE_ROOT; };
876CBCB916F20A88004D542B /* IdentityDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IdentityDelegate.h; sourceTree = "<group>"; };
876CBCBA16F20A88004D542B /* IdentityDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IdentityDelegate.m; sourceTree = "<group>"; };
876CD4C818A38B370069C296 /* CustomerSpecific.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = CustomerSpecific.plist; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1073,9 +1076,6 @@
87A108691802C116001F705D /* Logger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Logger.m; sourceTree = "<group>"; };
87A1086B1802CBDC001F705D /* logger.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logger.png; sourceTree = "<group>"; };
87A1086D1802CD92001F705D /* logger@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "logger@2x.png"; sourceTree = "<group>"; };
87A1F57D19A26AF60054A6B8 /* boost.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = boost.a; path = ../../OpenPeerSDK.framework/Versions/C/Libraries/boost.a; sourceTree = SOURCE_ROOT; };
87A1F57E19A26AF60054A6B8 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../../OpenPeerSDK.framework/Versions/C/Libraries/libcurl.a; sourceTree = SOURCE_ROOT; };
87A1F58219A26B370054A6B8 /* OpenpeerDataModel.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = OpenpeerDataModel.bundle; path = ../../OpenPeerSDK.framework/Versions/C/Resources/OpenpeerDataModel.bundle; sourceTree = SOURCE_ROOT; };
87A1F58419A26C130054A6B8 /* OpenPeerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenPeerSDK.framework; path = ../../OpenPeerSDK.framework; sourceTree = SOURCE_ROOT; };
87B5EABE18683E3B00D25C3B /* APNSManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APNSManager.h; sourceTree = "<group>"; };
87B5EABF18683E3B00D25C3B /* APNSManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = APNSManager.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1181,8 +1181,8 @@
0012C552177D11DB0017FF5E /* libz.dylib in Frameworks */,
87FF9862170EDAF10017C627 /* libxml2.dylib in Frameworks */,
87EE5FE9166E917B002C5FA3 /* libresolv.dylib in Frameworks */,
8766E8C41A07F6D1007384C5 /* libcurl.a in Frameworks */,
87A1F58519A26C130054A6B8 /* OpenPeerSDK.framework in Frameworks */,
87A1F58019A26AF60054A6B8 /* libcurl.a in Frameworks */,
87E0FFB417BB8ADD00F30484 /* AddressBook.framework in Frameworks */,
87FF988E170EDB5D0017C627 /* AssetsLibrary.framework in Frameworks */,
87EE5FF8166E9625002C5FA3 /* AVFoundation.framework in Frameworks */,
Expand All @@ -1198,7 +1198,7 @@
8727282F166CBF9B0089CBB6 /* Foundation.framework in Frameworks */,
87FF9890170EDB6D0017C627 /* MobileCoreServices.framework in Frameworks */,
87448B0517905FFC00E374EE /* QuartzCore.framework in Frameworks */,
87A1F57F19A26AF60054A6B8 /* boost.a in Frameworks */,
8766E8C21A07F6D1007384C5 /* boost.a in Frameworks */,
0024393C178F55BF00B79368 /* Security.framework in Frameworks */,
8727282D166CBF9B0089CBB6 /* UIKit.framework in Frameworks */,
);
Expand All @@ -1213,7 +1213,7 @@
87D4BDFC18683B65008C2D30 /* CoreLocation.framework in Frameworks */,
87D4BDFA18683B59008C2D30 /* CoreTelephony.framework in Frameworks */,
87D4BDF818683B4C008C2D30 /* libsqlite3.dylib in Frameworks */,
87A1F58819A26DAF0054A6B8 /* libcurl.a in Frameworks */,
8766E8C51A07F6D1007384C5 /* libcurl.a in Frameworks */,
87D4BDF618683B39008C2D30 /* SystemConfiguration.framework in Frameworks */,
8780DB9D19E7F72D00AB196C /* libUAirship-5.0.2.a in Frameworks */,
87D4BDF418683B16008C2D30 /* CFNetwork.framework in Frameworks */,
Expand All @@ -1237,7 +1237,7 @@
87D4BD2818675368008C2D30 /* QuartzCore.framework in Frameworks */,
87D4BD2918675368008C2D30 /* Security.framework in Frameworks */,
87D4BD2A18675368008C2D30 /* UIKit.framework in Frameworks */,
87A1F58719A26DAF0054A6B8 /* boost.a in Frameworks */,
8766E8C31A07F6D1007384C5 /* boost.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -1541,9 +1541,9 @@
8727282B166CBF9B0089CBB6 /* Frameworks */ = {
isa = PBXGroup;
children = (
8766E8C01A07F6D1007384C5 /* boost.a */,
8766E8C11A07F6D1007384C5 /* libcurl.a */,
87A1F58419A26C130054A6B8 /* OpenPeerSDK.framework */,
87A1F57D19A26AF60054A6B8 /* boost.a */,
87A1F57E19A26AF60054A6B8 /* libcurl.a */,
874B135B1935F96800993F8D /* AudioToolbox.framework */,
8770C34218BB7ABB006F28F0 /* libstdc++.6.0.9.dylib */,
8774AC4A1897E2F2006B91FA /* ImageIO.framework */,
Expand Down Expand Up @@ -1595,7 +1595,7 @@
87272833166CBF9B0089CBB6 /* Supporting Files */ = {
isa = PBXGroup;
children = (
87A1F58219A26B370054A6B8 /* OpenpeerDataModel.bundle */,
8766E8C61A07F6ED007384C5 /* OpenpeerDataModel.bundle */,
878E880B19105076000DAA8A /* OpenPeerSampleAPNSApp-Info.plist */,
876CD4C818A38B370069C296 /* CustomerSpecific.plist */,
8754280818C7A2FD007F626F /* CustomerSpecific_Release.plist */,
Expand Down Expand Up @@ -2400,10 +2400,10 @@
8730D7AD1833A63D008D1D37 /* iPhone_loader_00001.png in Resources */,
8722474C182D15750027DA50 /* iPhone_menu_grid_background.png in Resources */,
8722475C182D165A0027DA50 /* audio-call-speaker-active@2x.png in Resources */,
87A1F58319A26B370054A6B8 /* OpenpeerDataModel.bundle in Resources */,
8730D7D11833A63D008D1D37 /* iPhone_loader_00019.png in Resources */,
87224759182D165A0027DA50 /* audio-call-mic-active@2x.png in Resources */,
8780DB7919E7F25C00AB196C /* UAInboxMessageListCell.xib in Resources */,
8766E8C71A07F6ED007384C5 /* OpenpeerDataModel.bundle in Resources */,
8730D7C81833A63D008D1D37 /* iPhone_loader_00014@2x.png in Resources */,
8780DB8919E7F25C00AB196C /* UAPushUI.strings in Resources */,
8754280918C7A2FD007F626F /* CustomerSpecific_Release.plist in Resources */,
Expand All @@ -2430,6 +2430,7 @@
87D4BD2D18675368008C2D30 /* iPhone_loader_00007@2x.png in Resources */,
8723871119465A57002643D6 /* ActiveSessionTableViewCell.xib in Resources */,
87D4BD2E18675368008C2D30 /* VideoCallViewController.xib in Resources */,
8766E8C81A07F6ED007384C5 /* OpenpeerDataModel.bundle in Resources */,
8781C575196C86740030E113 /* table_cell_background@2x.png in Resources */,
87D4BD2F18675368008C2D30 /* InfoPlist.strings in Resources */,
87D4BD3018675368008C2D30 /* IncomingCallView_iPhone.xib in Resources */,
Expand Down Expand Up @@ -2602,7 +2603,6 @@
87D4BDC018675368008C2D30 /* iPhone_loader_00001.png in Resources */,
87D4BDC118675368008C2D30 /* iPhone_menu_grid_background.png in Resources */,
87D7EF5E19785CDC003B1746 /* iPhone_tabBar_favorites_active.png in Resources */,
87A1F58919A26DB20054A6B8 /* OpenpeerDataModel.bundle in Resources */,
87D4BDC218675368008C2D30 /* audio-call-speaker-active@2x.png in Resources */,
87D4BDC318675368008C2D30 /* iPhone_loader_00019.png in Resources */,
87D4BDC418675368008C2D30 /* audio-call-mic-active@2x.png in Resources */,
Expand Down Expand Up @@ -2910,6 +2910,7 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/3rdParties/Airship",
../../OpenPeerSDK.framework/Libraries,
);
ONLY_ACTIVE_ARCH = NO;
OTHER_CPLUSPLUSFLAGS = (
Expand Down Expand Up @@ -2954,6 +2955,7 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/3rdParties/Airship",
../../OpenPeerSDK.framework/Libraries,
);
ONLY_ACTIVE_ARCH = NO;
OTHER_CPLUSPLUSFLAGS = (
Expand Down Expand Up @@ -3004,6 +3006,7 @@
"$(inherited)",
./3rdParties/Airship/,
"$(PROJECT_DIR)/3rdParties/Airship",
../../OpenPeerSDK.framework/Libraries,
);
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "";
Expand Down Expand Up @@ -3051,6 +3054,7 @@
"$(inherited)",
./3rdParties/Airship/,
"$(PROJECT_DIR)/3rdParties/Airship",
../../OpenPeerSDK.framework/Libraries,
);
ONLY_ACTIVE_ARCH = NO;
OTHER_CPLUSPLUSFLAGS = (
Expand Down

0 comments on commit 967eb8a

Please sign in to comment.