← Back to branch summary

~vanvugt/mir/managed-surface

Viewing all changes in revision 2183.

  • Committer: Daniel van Vugt
  • Date: 2014-12-15 06:29:52 UTC
  • Revision ID: daniel.van.vugt@canonical.com-20141215062952-knlrrfe3o1zhor2b
Fix conflict properly.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: