kylefang/RestKit
1
0
Fork 0
mirror of https://github.com/zhigang1992/RestKit.git synced 2026-04-25 05:15:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.9' into xml-parser

Browse Source 
Conflicts:
	Examples/RKTwitter/Classes/RKTwitterViewController.m
	README.md
	RestKit.xcodeproj/project.pbxproj
This commit is contained in:
Blake Watters
2011-03-27 22:29:19 -04:00
parent 6ae94fb0bf 5411f54d02
commit 227f35a20d
497 changed files with 6381 additions and 17051 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Examples/RKTwitterCoreData/RKTwitterCoreData.xcodeproj/project.pbxproj
View File

@@ -76,11 +76,18 @@
remoteGlobalIDString = 3F6C39A510FE5C95008F47C5;
remoteInfo = UISpec;
};
25E5EEB3133BB2D700C33091 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 2538E7FF123417E500ACB5D7 /* RestKit.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 73057FD11331AD2E001908EE;
remoteInfo = "RestKitJSONParser+JSONKit";
};
25F2A1771322D59400A33DE4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 2538E7FF123417E500ACB5D7 /* RestKit.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 25956956126DF0A8004BAC4C;
remoteGlobalIDString = 255B7588133BABBF00ED76AD;
remoteInfo = RestKit;
};
3F3CE2C4125B93780083FDCB /* PBXContainerItemProxy */ = {
@@ -129,7 +136,7 @@
isa = PBXContainerItemProxy;
containerPortal = 2538E7FF123417E500ACB5D7 /* RestKit.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 25956956126DF0A8004BAC4C;
remoteGlobalIDString = 255B7588133BABBF00ED76AD;
remoteInfo = RestKit;
};
/* End PBXContainerItemProxy section */
@@ -244,6 +251,7 @@
3F3CE2C9125B93780083FDCB /* libRestKitSupport.a */,
3F3CE2CB125B93780083FDCB /* libRestKitJSONParserYAJL.a */,
3F3CE2CD125B93780083FDCB /* libRestKitJSONParserSBJSON.a */,
25E5EEB4133BB2D700C33091 /* libRestKitJSONParserJSONKit.a */,
3F3CE2CF125B93780083FDCB /* libRestKitCoreData.a */,
2538E808123417E500ACB5D7 /* libRestKitThree20.a */,
2538E80A123417E500ACB5D7 /* UISpec.app */,
@@ -391,6 +399,13 @@
remoteRef = 2538E809123417E500ACB5D7 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
25E5EEB4133BB2D700C33091 /* libRestKitJSONParserJSONKit.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libRestKitJSONParserJSONKit.a;
remoteRef = 25E5EEB3133BB2D700C33091 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
3F3CE2C5125B93780083FDCB /* libRestKitNetwork.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;