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

Merge remote branch 'origin/0.9' into core-data-cleanup

Browse Source 
Conflicts:
	Code/CoreData/CoreData.h
	Code/CoreData/RKManagedObjectStore.h
	Code/CoreData/RKManagedObjectStore.m
	Code/CoreData/RKObjectSeeder.h
	Code/CoreData/RKObjectSeeder.m
	Code/ObjectMapping/RKObjectLoader.m
	Code/ObjectMapping/RKObjectManager.m
	Code/ObjectMapping/RKObjectMapper.m
	RestKit.xcodeproj/project.pbxproj
This commit is contained in:
Blake Watters
2011-03-19 21:26:13 -04:00
parent a94456a01e 87830e8150
commit 88a1b013fc
470 changed files with 2185 additions and 17022 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Code/CoreData/CoreData.h
View File

@@ -10,6 +10,5 @@
#import "../ObjectMapping/ObjectMapping.h"
#import "RKManagedObject.h"
#import "RKManagedObjectStore.h"
#import "RKManagedObjectLoader.h"
#import "RKObjectSeeder.h"
#import "RKManagedObjectCache.h"
#import "RKManagedObjectSeeder.h"
#import "RKManagedObjectCache.h"