Blake Watters 88a1b013fc Merge remote branch 'origin/0.9' into core-data-cleanup ...

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

2011-03-19 21:26:13 -04:00

..

Network.h

Revert "Remove per-file copyrights"

2011-01-12 15:27:19 -05:00

NSDictionary+RKRequestSerialization.h

Revert "Remove per-file copyrights"

2011-01-12 15:27:19 -05:00

NSDictionary+RKRequestSerialization.m

Revert "Remove per-file copyrights"

2011-01-12 15:27:19 -05:00

NSObject+RKJSONSerialization.m

Revert "Remove per-file copyrights"

2011-01-12 15:27:19 -05:00

RKClient.h

More cleanups. Have a bug in the refactored object loader

2011-02-13 03:33:37 -05:00

RKClient.m

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

2011-03-19 21:26:13 -04:00

RKJSONSerialization.h

Revert "Remove per-file copyrights"

2011-01-12 15:27:19 -05:00

RKJSONSerialization.m

Revert "Remove per-file copyrights"

2011-01-12 15:27:19 -05:00

RKNotifications.h

Revert "Remove per-file copyrights"

2011-01-12 15:27:19 -05:00

RKNotifications.m

Revert "Remove per-file copyrights"

2011-01-12 15:27:19 -05:00

RKParams.h

Revert "Remove per-file copyrights"

2011-01-12 15:27:19 -05:00

RKParams.m

More Xcode 4 crap

2011-02-15 20:25:22 -05:00

RKParamsAttachment.h

Working on new example

2011-01-16 21:43:21 -05:00

RKParamsAttachment.m

More Xcode 4 crap

2011-02-15 20:25:22 -05:00

RKReachabilityObserver.h

Revert "Remove per-file copyrights"

2011-01-12 15:27:19 -05:00

RKReachabilityObserver.m

Ooops. Use the IP from the hostname rather than the local wireless interface

2011-02-01 19:38:11 -05:00

RKRequest.h

Cleaning up some TODO's and such

2011-02-13 02:59:37 -05:00

RKRequest.m

Merge Kevin Lord's patch for ignoring request body on a GET request

2011-03-09 15:34:01 -05:00

RKRequestQueue.h

Revert "Remove per-file copyrights"

2011-01-12 15:27:19 -05:00

RKRequestQueue.m

More Xcode 4 crap

2011-02-15 20:25:22 -05:00

RKRequestSerializable.h

Revert "Remove per-file copyrights"

2011-01-12 15:27:19 -05:00

RKResponse.h

Revert "Remove per-file copyrights"

2011-01-12 15:27:19 -05:00

RKResponse.m

Merge branch 'master' of github.com:twotoasters/RestKit into new-example

2011-01-21 14:54:40 -05:00

RKURL.h

Revert "Remove per-file copyrights"

2011-01-12 15:27:19 -05:00

RKURL.m

Revert "Remove per-file copyrights"

2011-01-12 15:27:19 -05:00