← Back to branch summary

~mmcg069/software-center/appstore-experiment

~mmcg069/software-center/appstore-experiment

Viewing all changes in revision 1470.

Committer: Matthew McGowan
Date: 2011-03-22 21:30:02 UTC
mfrom: (1354.61.38 software-center)
Revision ID: matthew.joseph.mcgowan@gmail.com-20110322213002-b7vspsatrtpssjz9

merge and resolve

files added:
test/data/app-install

test/data/app-install/desktop

test/data/app-install/desktop/deja-dup.desktop

test/data/app-install/desktop/kde4__soundkonverter.desktop

test/data/applications

test/data/applications/deja-dup.desktop

test/data/applications/kde4

test/data/applications/kde4/soundkonverter.desktop

files modified:
README

debian/changelog

software-center

softwarecenter/backend/weblive.py

softwarecenter/db/reviews.py

softwarecenter/enums.py

softwarecenter/models/appstore.py

softwarecenter/utils.py

softwarecenter/view/appdetailsview_gtk.py

softwarecenter/view/softwarepane.py

softwarecenter/view/widgets/description.py

softwarecenter/view/widgets/reviews.py

softwarecenter/view/widgets/thumbnail.py

test/test_unity_launcher_integration.py

test/test_where_is_it.py

Show diffs side-by-side

added added

removed removed

debian/changelog

software-center

softwarecenter/backend/weblive.py

softwarecenter/db/reviews.py

softwarecenter/enums.py

softwarecenter/models/appstore.py

softwarecenter/utils.py

softwarecenter/view/appdetailsview_gtk.py

softwarecenter/view/softwarepane.py

softwarecenter/view/widgets/description.py

softwarecenter/view/widgets/reviews.py

softwarecenter/view/widgets/thumbnail.py

test/data/app-install/

test/data/app-install/desktop/

test/data/app-install/desktop/deja-dup.desktop

test/data/app-install/desktop/kde4__soundkonverter.desktop

test/data/applications/

test/data/applications/deja-dup.desktop

test/data/applications/kde4/

test/data/applications/kde4/soundkonverter.desktop

test/test_unity_launcher_integration.py

test/test_where_is_it.py

Older »