Merge lp:~ubuntu-branches/ubuntu/lucid/oxygen-icons/lucid-201002221433 into lp:ubuntu/lucid/oxygen-icons
Proposed by
James Westby
Status: | Needs review |
---|---|
Proposed branch: | lp:~ubuntu-branches/ubuntu/lucid/oxygen-icons/lucid-201002221433 |
Merge into: | lp:ubuntu/lucid/oxygen-icons |
Diff against target: |
34 lines (+12/-0) (has conflicts) 2 files modified
debian/changelog (+11/-0) debian/oxygen-icon-theme-complete.install (+1/-0) Text conflict in debian/changelog Conflict adding file debian/oxygen-icon-theme-complete.install. Moved existing file to debian/oxygen-icon-theme-complete.install.moved. |
To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/lucid/oxygen-icons/lucid-201002221433 |
Related bugs: |
To post a comment you must log in.
Unmerged revisions
- 20. By Jonathan Riddell
-
* Split out 256x256 icons into new package, allows to save space
on CD if we have to
* Use lzma compression
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/oxygen-icons now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/oxygen-icons/lucid-201002221433. A merge should be performed if necessary.