← Back to branch summary

~thomas-moenicke/phablet-extras/maliit-plugins-layout-context

Viewing all changes in revision 2139.

  • Committer: Thomas Moenicke
  • Date: 2013-07-17 13:21:17 UTC
  • mfrom: (2130.2.3 maliit-plugins)
  • Revision ID: thomas.moenicke@canonical.com-20130717132117-y1eyha67x1z1bjrb
fix merge conflict

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: