Merge lp://staging/~mikemc/ubuntuone-ios-files/project-jumble into lp://staging/ubuntuone-ios-files
Proposed by
Mike McCracken
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Mike McCracken | ||||
| Approved revision: | 97 | ||||
| Merged at revision: | 98 | ||||
| Proposed branch: | lp://staging/~mikemc/ubuntuone-ios-files/project-jumble | ||||
| Merge into: | lp://staging/ubuntuone-ios-files | ||||
| Diff against target: |
217 lines (+66/-13) 1 file modified
Files.xcodeproj/project.pbxproj (+66/-13) |
||||
| To merge this branch: | bzr merge lp://staging/~mikemc/ubuntuone-ios-files/project-jumble | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| dobey (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- Jumble of changes to allow earlier branches to actually work in XCode.
Description of the change
- Jumble of changes to allow earlier branches to actually work in XCode.
My apologies for the jumble, but xcode changes are hard to keep separate.
- Add test files, and links to OCHamcrest and OCMockito test frameworks
- Add new data model and version
- Fix test target names
- Add new U1AssetManager.h,m
To post a comment you must log in.
Revision history for this message
| Mike McCracken (mikemc) wrote | # |
Revision history for this message
| Mike McCracken (mikemc) wrote | # |
Revision history for this message
| dobey (dobey) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Note that the "add new data model and version" change is split between this and lp:~mikemc/ubuntuone-ios-files/asset-datamodel-tweak -- that branch has the actual file for the new data model, while here we just have the project file entry that adds it to the project, and makes it the currentversion.