← Back to branch summary

~vcs-imports/emc/master

Viewing all changes in revision 10854.

  • Committer: Sebastian Kuzminsky
  • Date: 2015-07-28 20:07:29 UTC
  • mfrom: (10742.11.67)
  • Revision ID: git-v1:77eb37da677e30dc3f64b6249fe71b3771c04966
Merge remote-tracking branch 'origin/2.7'

Conflicts:
        tests/halui/mdi/test-ui.py

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: