Merge lp://qastaging/~user-none/calibre/dev into lp://qastaging/calibre
Proposed by
John Schember
| Status: | Merged |
|---|---|
| Merged at revision: | 14107 |
| Proposed branch: | lp://qastaging/~user-none/calibre/dev |
| Merge into: | lp://qastaging/calibre |
| Diff against target: |
594 lines (+408/-52) 8 files modified
src/calibre/customize/builtins.py (+2/-2) src/calibre/gui2/store/stores/amazon_de_plugin.py (+94/-3) src/calibre/gui2/store/stores/amazon_es_plugin.py (+93/-3) src/calibre/gui2/store/stores/amazon_fr_plugin.py (+94/-3) src/calibre/gui2/store/stores/amazon_it_plugin.py (+94/-3) src/calibre/gui2/store/stores/amazon_plugin.py (+4/-12) src/calibre/gui2/store/stores/amazon_uk_plugin.py (+24/-25) src/calibre/gui2/store/stores/waterstones_uk_plugin.py (+3/-1) |
| To merge this branch: | bzr merge lp://qastaging/~user-none/calibre/dev |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Kovid Goyal | Pending | ||
|
Review via email:
|
|||
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
