Blake Watters
|
f0706dbdbf
|
Work in progress
Conflicts:
Code/CoreData/RKManagedObjectLoader.h
Code/CoreData/RKManagedObjectLoader.m
Code/CoreData/RKManagedObjectMapping.m
Code/CoreData/RKManagedObjectMappingOperation.m
Code/CoreData/RKManagedObjectStore.m
Code/CoreData/RKManagedObjectThreadSafeInvocation.h
Code/CoreData/RKManagedObjectThreadSafeInvocation.m
Code/CoreData/RKSearchableManagedObject.m
Code/ObjectMapping/RKObjectLoader.m
Code/ObjectMapping/RKObjectMapper.h
Code/ObjectMapping/RKObjectMappingOperation.m
RestKit.xcodeproj/project.pbxproj
Tests/Logic/CoreData/RKManagedObjectThreadSafeInvocationTest.m
|
2012-07-13 13:07:42 -04:00 |
|