commit | 98a5a42de0c2fa8cdef01e009c3f21be90434bd7 | [log] [tgz] |
---|---|---|
author | Grégoire Dupé <gdupe@mia-software.com> | Mon Feb 13 18:41:58 2017 +0100 |
committer | Grégoire Dupé <gdupe@mia-software.com> | Mon Feb 13 18:41:58 2017 +0100 |
tree | f114b3e0887e3531d62cc34b7e39f530eabc83f7 | |
parent | 65a9739df2db5f7e5e4534f420bd92596467ca36 [diff] | |
parent | a3639afbebb3d3ded4d726e71ab408a761509649 [diff] |
Merge branch 'maintenance-0.13' into maintenance-1.0 Conflicts: org.eclipse.modisco.infra.browser.editor.ui/plugin.xml Change-Id: I7d983b8b97d9f6f06345e05475f7c250939ffc1a