Merge branch 'master' into spotifyplaylists

Browse Source

...

This commit is contained in:

Leo Franchi

2012-04-06 20:03:02 -04:00

parent 6a6e2754c4 ebd59724a5

commit fd81151996

76 changed files with 1153 additions and 484 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

data/images/account-settings.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.3 KiB After Width:  |  Height:  |  Size: 19 KiB

BIN

data/images/advanced-settings.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.3 KiB After Width:  |  Height:  |  Size: 19 KiB

BIN

data/images/collection.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 68 KiB

BIN

data/images/music-settings.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.3 KiB After Width:  |  Height:  |  Size: 19 KiB

BIN

data/images/user-avatar.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 19 KiB After Width:  |  Height:  |  Size: 19 KiB