Merge lp://staging/~ubuntu-branches/ubuntu/natty/ubiquity-slideshow-ubuntu/natty-201103250157 into lp://staging/ubuntu/natty/ubiquity-slideshow-ubuntu
Proposed by
James Westby
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~ubuntu-branches/ubuntu/natty/ubiquity-slideshow-ubuntu/natty-201103250157 |
| Merge into: | lp://staging/ubuntu/natty/ubiquity-slideshow-ubuntu |
| Diff against target: |
258 lines (+150/-0) (has conflicts) 8 files modified
debian/changelog (+13/-0) po/edubuntu/slideshow-edubuntu.pot (+4/-0) po/kubuntu/slideshow-kubuntu.pot (+4/-0) po/lubuntu/slideshow-lubuntu.pot (+4/-0) po/ubuntu/slideshow-ubuntu.pot (+113/-0) po/xubuntu/slideshow-xubuntu.pot (+4/-0) slideshows/ubuntu/slides/office.html (+4/-0) slideshows/ubuntu/slides/welcome.html (+4/-0) Text conflict in debian/changelog Text conflict in po/edubuntu/slideshow-edubuntu.pot Text conflict in po/kubuntu/slideshow-kubuntu.pot Text conflict in po/lubuntu/slideshow-lubuntu.pot Text conflict in po/ubuntu/slideshow-ubuntu.pot Text conflict in po/xubuntu/slideshow-xubuntu.pot Text conflict in slideshows/ubuntu/slides/office.html Text conflict in slideshows/ubuntu/slides/welcome.html |
| To merge this branch: | bzr merge lp://staging/~ubuntu-branches/ubuntu/natty/ubiquity-slideshow-ubuntu/natty-201103250157 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/ubiquity-slideshow-ubuntu now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/ubiquity-slideshow-ubuntu/natty-201103250157. A merge should be performed if necessary.
To post a comment you must log in.
Unmerged revisions
- 29. By Didier Roche-Tolomelli
-
* Bump version numbers to 11.04. Many slides still need to be rewritten
(LP: #683999)
* Changing OpenOffice.org to LibreOffice in all variants
(LP: #692879, #712548)
* POT files updatedThanks a lot Marco Biscaro
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
