Merge lp://qastaging/~rockstar/ubuntuone-ios-music/project-settings into lp://qastaging/ubuntuone-ios-music
Proposed by
Paul Hummer
| Status: | Merged |
|---|---|
| Approved by: | Paul Hummer |
| Approved revision: | 238 |
| Merged at revision: | 228 |
| Proposed branch: | lp://qastaging/~rockstar/ubuntuone-ios-music/project-settings |
| Merge into: | lp://qastaging/ubuntuone-ios-music |
| Diff against target: |
307 lines (+41/-34) 13 files modified
Dependencies/JSONKit/JSONKit.m (+18/-18) Dependencies/oauthconsumer/OAMutableURLRequest.m (+1/-1) Dependencies/oauthconsumer/OATokenManager.m (+1/-1) SynthesizeSingleton.h (+1/-1) U1Music.xcodeproj/project.pbxproj (+5/-3) categories/UIImage+Resize.m (+4/-0) utilities/AudioStreamer.h (+2/-2) utilities/AudioStreamer.m (+3/-3) utilities/Reachability.h (+1/-0) utilities/U1SocketListener.h (+1/-1) utilities/U1StreamWriter.h (+2/-2) utilities/operations/Downloader.m (+1/-1) utilities/operations/U1ChunkDownloadOperation.m (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~rockstar/ubuntuone-ios-music/project-settings |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Zachery Bir | Approve | ||
|
Review via email:
|
|||
Commit message
Update u1music project settings
Description of the change
Update the u1music project settings, kill most of the warnings.
The only warnings I didn't kill were the Categories re-implementing methods. It's encouraged that we use inheritance for that (and rightly so). However, that means refactoring, which I don't think we want to do right now.
This branch was SUPER educational.
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
Looks good, land it!