commit | 94d85858f02a86e145e1ad458cd8230f7789b124 | [log] [tgz] |
---|---|---|
author | Fabien Giquel <fgiquel@mia-software.com> | Mon Apr 09 15:05:35 2018 +0200 |
committer | Fabien Giquel <fgiquel@mia-software.com> | Mon Apr 09 15:05:35 2018 +0200 |
tree | fe3d6849e4b100118f0bc24233138bc4a4190c11 | |
parent | ea3b6d5b8b35733a9d4b6849bfb75ec3a64bd343 [diff] | |
parent | 6dd8f848a6158cc59d2eabe8fa940c38057bfb61 [diff] |
Merge remote-tracking branch 'origin/maintenance-1.0' into maintenance-1.1 Conflicts: org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditor.java Change-Id: Ic397081cb0929c62a6ebf9132f509f363e010fac