← Back to branch summary

~mmcg069/software-center/ui-playground

~mmcg069/software-center/ui-playground

Viewing all changes in revision 858.3.32.

Committer: Gary Lasker
Date: 2010-07-16 04:58:13 UTC
mfrom: (914 trunk)
mto: (858.2.51 buy-something)
mto: This revision was merged to the branch mainline in revision 980.
Revision ID: gary.lasker@canonical.com-20100716045813-9usnjpdcxy4k45uk

merge from trunk, fix conflicts

files modified:
data/ui/dialogs.ui

debian/changelog

softwarecenter/app.py

softwarecenter/enums.py

softwarecenter/view/appdetailsview.py

softwarecenter/view/appdetailsview_gtk.py

softwarecenter/view/appdetailsview_webkit.py

softwarecenter/view/appview.py

softwarecenter/view/softwarepane.py

test/test_launchpad.py

Show diffs side-by-side

added added

removed removed

data/ui/dialogs.ui

debian/changelog

softwarecenter/app.py

softwarecenter/enums.py

softwarecenter/view/appdetailsview.py

softwarecenter/view/appdetailsview_gtk.py

softwarecenter/view/appdetailsview_webkit.py

softwarecenter/view/appview.py

softwarecenter/view/softwarepane.py

test/test_launchpad.py

Older »