Merge lp://qastaging/~rockstar/ubuntuone-ios-music/ios5-round-one into lp://qastaging/ubuntuone-ios-music
Proposed by
Paul Hummer
| Status: | Merged |
|---|---|
| Approved by: | Paul Hummer |
| Approved revision: | 232 |
| Merged at revision: | 230 |
| Proposed branch: | lp://qastaging/~rockstar/ubuntuone-ios-music/ios5-round-one |
| Merge into: | lp://qastaging/ubuntuone-ios-music |
| Diff against target: |
4126 lines (+8/-3998) 7 files modified
Dependencies/JSONKit/CHANGELOG.md (+0/-389) Dependencies/JSONKit/JSONKit.h (+0/-251) Dependencies/JSONKit/JSONKit.m (+0/-3022) Dependencies/JSONKit/README.md (+0/-307) U1Music.xcodeproj/project.pbxproj (+4/-22) utilities/operations/UOJSONFetchOperation.m (+1/-4) view_controllers/UOMusicLoginController.m (+3/-3) |
| To merge this branch: | bzr merge lp://qastaging/~rockstar/ubuntuone-ios-music/ios5-round-one |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Zachery Bir | Approve | ||
|
Review via email:
|
|||
Commit message
Remove JSONKit dependency, bump to iOS 5
Description of the change
Bump to iOS 5.0. Remove JSONKit dependency (much easier than I expected)
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Go for it. It's time to go 5.0+ (sorry, Martin)