Merge lp://staging/~smartboyhw/ubuntu/raring/rekonq/2.2.1-0ubuntu1-1st-upload into lp://staging/ubuntu/raring/rekonq
Proposed by
Howard Chan
| Status: | Merged |
|---|---|
| Merged at revision: | 59 |
| Proposed branch: | lp://staging/~smartboyhw/ubuntu/raring/rekonq/2.2.1-0ubuntu1-1st-upload |
| Merge into: | lp://staging/ubuntu/raring/rekonq |
| Diff against target: |
3611 lines (+328/-1793) 26 files modified
.pc/.quilt_patches (+0/-1) .pc/.quilt_series (+0/-1) .pc/.version (+0/-1) .pc/applied-patches (+0/-5) .pc/kubuntu_adblock.diff/src/data/adblockrc (+0/-187) .pc/kubuntu_default_homepages.diff/src/rekonq.kcfg (+0/-288) .pc/kubuntu_initial_preference.diff/src/data/rekonq.desktop (+0/-99) .pc/kubuntu_no_default_bookmarks.diff/src/data/defaultbookmarks.xbel (+0/-19) .pc/kubuntu_restricted_install.diff/src/application.cpp (+0/-874) CMakeLists.txt (+1/-1) debian/changelog (+6/-0) po/cs/rekonq.po (+19/-19) po/fi/rekonq.po (+8/-17) po/fr/rekonq.po (+18/-18) po/nb/rekonq.po (+112/-102) po/sk/rekonq.po (+1/-1) po/sr/rekonq.po (+35/-35) po/sr@ijekavian/rekonq.po (+35/-35) po/sr@ijekavianlatin/rekonq.po (+35/-35) po/sr@latin/rekonq.po (+35/-35) src/application.cpp (+0/-12) src/bookmarks/bookmarkmanager.cpp (+2/-2) src/data/adblockrc (+2/-2) src/data/defaultbookmarks.xbel (+15/-0) src/data/rekonq.desktop (+1/-1) src/rekonq.kcfg (+3/-3) |
| To merge this branch: | bzr merge lp://staging/~smartboyhw/ubuntu/raring/rekonq/2.2.1-0ubuntu1-1st-upload |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
New upstream minor bookmarks bugfix release from 2.2 to 2.2.1. Since it's a minor bugfix release I did not file a FFe.
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
