~gerboland/unity-mir/more-robust-desktop-file-parsing

Viewing all changes in revision 122.

  • Committer: Gerry Boland
  • Date: 2013-10-14 11:30:51 UTC
  • mfrom: (120.2.2 trunk)
  • Revision ID: gerry.boland@canonical.com-20131014113051-ph8sjl0fcsje02e0
Merge trunk and fix conflict

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: