| commit | 1ead6c987003e0185382602090b731bb213da5c2 | [log] [tgz] |
|---|---|---|
| author | Edgar Mueller <edgar.m.mueller@gmail.com> | Mon May 21 18:29:42 2012 +0200 |
| committer | Edgar Mueller <edgar.m.mueller@gmail.com> | Mon May 21 18:29:42 2012 +0200 |
| tree | 9cbfe5a939f0d02decb8bf5c1f57c1849f60cc17 | |
| parent | 5360bb29f813c76c5e26c9faf8df70c2a8afbc4f [diff] | |
| parent | 37278a5c81e824736fe2a617e03d7045cab5a158 [diff] |
Merge branch 'master' of ssh://emueller@git.eclipse.org/gitroot/emfclient/org.eclipse.emf.ecp.releng.git Conflicts: 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