| commit | cace5bd2e2e8de18a926f923502a560599dcb6d6 | [log] [tgz] |
|---|---|---|
| author | Edgar Mueller <edgar.m.mueller@gmail.com> | Thu Jan 05 12:26:37 2012 +0100 |
| committer | Edgar Mueller <edgar.m.mueller@gmail.com> | Thu Jan 05 12:26:37 2012 +0100 |
| tree | 2a1faf7543c8acb7e09036dc75736b6734af1159 | |
| parent | cfb4d27b9131b50a8dbf70f578a758fc9de86cc6 [diff] | |
| parent | 02e7f7e48c69c5d9bc1a35c0dea051ac09aee5d5 [diff] |
Merge branch 'master' of ssh://git.eclipse.org/gitroot/emfclient/org.eclipse.emf.ecp.releng Conflicts: EMF Client Platform (complete with EMFStore Workspace)/feature.xml org.eclipse.emf.ecp.common.feature/feature.xml org.eclipse.emf.ecp.editor.feature/feature.xml org.eclipse.emf.ecp.navigator.feature/feature.xml org.eclipse.emf.ecp.navigatoreditorbridge.feature/feature.xml org.eclipse.emf.ecp.validation.feature/feature.xml