| commit | 0212e9aa9c2e622e0e6a2c409a0b35b69843c0b1 | [log] [tgz] |
|---|---|---|
| author | Michael Wenz <michael.wenz@sap.com> | Tue Dec 29 15:54:49 2015 +0100 |
| committer | Michael Wenz <michael.wenz@sap.com> | Tue Dec 29 15:54:49 2015 +0100 |
| tree | a62368281103dc8610d4e3106983d3ca5217f119 | |
| parent | 9324c98fefa8328f14d47687d86ba73099130867 [diff] | |
| parent | f7a8facf8a0b1dd24e5cb79a1cbad8bfd1d9eda9 [diff] |
Merge branch 'master' into maven Conflicts: tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/PluginWizardTests.java Change-Id: I507db2270c7ed90f325174c7b91c9d5abd2213d8