mirror of
https://github.com/zhigang1992/RestKit.git
synced 2026-04-23 12:27:52 +08:00
88a1b013fc
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
21 lines
290 B
Plaintext
21 lines
290 B
Plaintext
# the build
|
|
Build
|
|
build
|
|
DerivedData
|
|
|
|
# temp nibs and swap files
|
|
*~.nib
|
|
*.swp
|
|
|
|
# OS X folder attributes
|
|
.DS_Store
|
|
|
|
# user-specific XCode stuff
|
|
*.mode1v3
|
|
*.mode2v3
|
|
*.pbxuser
|
|
*.perspectivev3
|
|
*.xcuserdatad
|
|
|
|
Examples/RKDiscussionBoardExample/discussion_board_backend/public/system/attachments/*
|