Ubuntu Software Center

Merge lp://staging/~dobey/software-center/update-5-6 into lp://staging/software-center/stable-5-6

  1. update-5-6
  2. Merge into stable-5-6
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: no longer in the source branch.
Merged at revision: 3296
Proposed branch: lp://staging/~dobey/software-center/update-5-6
Merge into: lp://staging/software-center/stable-5-6
Diff against target: 23736 lines (+6503/-17129)
12 files modified
.bzrignore (+2/-0)
data/icons/128x128/apps/softwarecenter.svg (+2293/-3431)
data/icons/16x16/apps/softwarecenter.svg (+564/-3407)
data/icons/24x24/apps/softwarecenter.svg (+678/-3412)
data/icons/48x48/apps/softwarecenter.svg (+666/-3420)
data/icons/scalable/apps/softwarecenter.svg (+2293/-3431)
data/ui/sso/sso.ui (+0/-2)
data/unbranded-software-center.desktop.in (+0/-13)
po/POTFILES.in (+0/-1)
setup.cfg (+0/-1)
setup.py (+7/-6)
softwarecenter/version.py (+0/-5)
To merge this branch: bzr merge lp://staging/~dobey/software-center/update-5-6
Reviewer Review Type Date Requested Status
Roberto Alsina Approve
Review via email: mp+154447@code.staging.launchpad.net

Commit message

[Rodney Dawes]

    - Move the distro codename check to happen when we build the version.py file.
    - Remove the unbranded .desktop file, to avoid unnecessary duplication.
    - Remove the softwarecenter/version.py and ignore it, to avoid useless conflicts.

[Robert Roth]

    - Remove foo tooltip from sso login and forgot password button. (LP: #1076189)

[Sebastien Bacher]

    - Updated icons from Canonical Design Team.

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

There was a problem validating some authors of the branch. Authors must be either one of the listed Launchpad users, or a member of one of the listed teams on Launchpad.

Persons or Teams:

    contributor-agreement-canonical
    software-store-developers

Unaccepted Authors:

    Sebastien Bacher <email address hidden>

lp://staging/~dobey/software-center/update-5-6 updated
3296. By Sebastien Bacher

[Rodney Dawes]

    - Move the distro codename check to happen when we build the version.py file.
    - Remove the unbranded .desktop file, to avoid unnecessary duplication.
    - Remove the softwarecenter/version.py and ignore it, to avoid useless conflicts.

[Robert Roth]

    - Remove foo tooltip from sso login and forgot password button. (LP: #1076189)

[Sebastien Bacher]

    - Updated icons from Canonical Design Team.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches