Merge lp:~lacike/calibre/hnonline into lp:calibre

Proposed by Ladislav Lenčucha
Status: Merged
Merged at revision: 14444
Proposed branch: lp:~lacike/calibre/hnonline
Merge into: lp:calibre
Diff against target: 2 lines (+0/-0) (has conflicts)
0 files modified
Contents conflict in recipes/icons/hnonline.png
To merge this branch: bzr merge lp:~lacike/calibre/hnonline
Reviewer Review Type Date Requested Status
Kovid Goyal Pending
Review via email: mp+150181@code.launchpad.net

Description of the change

Icon changed to squarish :-)

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
1=== added file 'recipes/icons/hnonline.png.OTHER'
2Binary files recipes/icons/hnonline.png.OTHER 1970-01-01 00:00:00 +0000 and recipes/icons/hnonline.png.OTHER 2013-02-23 06:40:28 +0000 differ

Subscribers

People subscribed via source and target branches