Blake Watters a1216d0ea0 Merge branch 'master' of github.com:twotoasters/RestKit into core-data-cleanup ...

Conflicts:
	Code/ObjectMapping/RKObjectMapper.m

2011-02-13 01:24:57 -05:00

..

CoreData

Work in progress factoring Core Data dependencies out of the Object Mapping layer

2011-02-13 01:19:37 -05:00

Network

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

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

ObjectMapping

Merge branch 'master' of github.com:twotoasters/RestKit into core-data-cleanup

2011-02-13 01:24:57 -05:00

Support

Revert "Remove per-file copyrights"

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

Three20

Always return an NSManagedObjectContext from the NSThreadDictionary. Do not bless the one on the main thread. Ensure merges happen on the main thread.

2011-01-13 14:33:28 -05:00

RestKit.h

Revert "Remove per-file copyrights"

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