~osomon/oxide/non-ime-initiated-text-edit

Viewing all changes in revision 1030.

  • Committer: Olivier Tilloy
  • Date: 2015-07-29 16:44:54 UTC
  • mfrom: (1022.1.147 trunk)
  • Revision ID: olivier.tilloy@canonical.com-20150729164454-me273q9cu26l39nh
Merge the latest changes from trunk and resolve a conflict.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: