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

..

CoreData

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

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

Network

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

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

ObjectMapping

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

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

Support

Revert "Remove per-file copyrights"

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

Three20

completed rollback of changes to default refresh rate code by setting the default loaded time for an app to the first-run date of the app

2011-03-12 09:40:35 -08:00

RestKit.h

Revert "Remove per-file copyrights"

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