~mterry/ubuntu-calculator-app/confined

Viewing all changes in revision 233.1.9.

  • Committer: Riccardo Padovani
  • Date: 2015-11-24 13:43:38 UTC
  • mfrom: (240 trunk)
  • mto: This revision was merged to the branch mainline in revision 241.
  • Revision ID: riccardo@rpadovani.com-20151124134338-z8ky7aesufqqx88x
Merge upstream and fix conflicts

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: