Viewing all changes in revision 192.
- Committer: Jason Foreman
- Date: 2011-06-16 18:33:42 UTC
- mfrom: (191.1.60 master)
- Revision ID: jason.foreman@canonical.com-20110616183342-vl7a4804xsf0s1b5
Merging branches for v 2.0.
lp:~threeve/ubuntuone-ios-client/master
lp:~urbanape/ubuntuone-ios-client/downloader
lp:~threeve/ubuntuone-ios-client/master
lp:~urbanape/ubuntuone-ios-client/downloader
- files added:
- musicstreaming/albums.png
- musicstreaming/utilities/operations
- files removed:
- musicstreaming/controls/AsynchronousImageView.h
- files renamed:
- musicstreaming/utilities/ImageLoader.h => musicstreaming/utilities/operations/AlbumArtLoader.h
- musicstreaming/utilities/ImageLoader.m => musicstreaming/utilities/operations/AlbumArtLoader.m
- musicstreaming/utilities/ImageLoadingOperation.h => musicstreaming/utilities/operations/AlbumArtLoadingOperation.h
- musicstreaming/utilities/ImageLoadingOperation.m => musicstreaming/utilities/operations/AlbumArtLoadingOperation.m
- files modified:
- .bzrignore
expand all
collapse all
added
removed
musicstreaming/Default.png
musicstreaming/Default@2x.png
musicstreaming/albums.png
musicstreaming/albums@2x.png
musicstreaming/artists.png
musicstreaming/artists@2x.png
musicstreaming/cached.png
musicstreaming/cached@2x.png
musicstreaming/images/default-album-art-small.png
musicstreaming/images/default-album-art.png
musicstreaming/partiallycached.png
musicstreaming/partiallycached@2x.png
musicstreaming/playlists.png
musicstreaming/playlists@2x.png
musicstreaming/settings.png
musicstreaming/settings@2x.png
musicstreaming/songs.png
musicstreaming/songs@2x.png
musicstreaming/uncached.png
musicstreaming/uncached@2x.png
