~gary-lasker/software-center/recommendations-categories-view

Viewing all changes in revision 2853.

  • Committer: Gary Lasker
  • Date: 2012-03-15 21:19:02 UTC
  • mfrom: (2725.2.141 trunk)
  • Revision ID: gary.lasker@canonical.com-20120315211902-r1ap55md9tcyz4at
merge trunk, resolve conflicts (gotta merge this branch as it keeps growing conflicts)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: