~vanvugt/mir/fatal-error

Viewing all changes in revision 1646.

  • Committer: Daniel van Vugt
  • Date: 2014-05-20 03:54:21 UTC
  • mfrom: (1623.1.17 development-branch)
  • Revision ID: daniel.van.vugt@canonical.com-20140520035421-hc1ueq2apmbwplpl
Merge latest development-branch and resolve a conflict.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: