diff options
| author | Christophe Bouhier | 2014-01-02 15:04:12 +0000 |
|---|---|---|
| committer | Christophe Bouhier | 2014-01-02 15:04:12 +0000 |
| commit | a19976c69b540b7170051f00366f1294ffb92680 (patch) | |
| tree | b297dba1105cf086db7fa7ab9644771731bfbb2a | |
| parent | 6d3968042c48eaddcd12a88bac908b76640bb59a (diff) | |
| parent | 62d8c897291ccc03867c5658bb4cd25fa7943ea3 (diff) | |
| download | org.eclipse.emf.edapt-a19976c69b540b7170051f00366f1294ffb92680.tar.gz org.eclipse.emf.edapt-a19976c69b540b7170051f00366f1294ffb92680.tar.xz org.eclipse.emf.edapt-a19976c69b540b7170051f00366f1294ffb92680.zip | |
Merge branch 'topic_cdo' of ssh://git.eclipse.org/gitroot/edapt/org.eclipse.emf.edapt into topic_cdo
Conflicts:
features/org.eclipse.emf.edapt.runtime.cdo.feature/feature.xml
plugins/org.eclipse.emf.edapt.history.cdo/META-INF/MANIFEST.MF
| -rw-r--r-- | features/org.eclipse.emf.edapt.runtime.cdo.feature/feature.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/features/org.eclipse.emf.edapt.runtime.cdo.feature/feature.xml b/features/org.eclipse.emf.edapt.runtime.cdo.feature/feature.xml index f83d782..f10ddd0 100644 --- a/features/org.eclipse.emf.edapt.runtime.cdo.feature/feature.xml +++ b/features/org.eclipse.emf.edapt.runtime.cdo.feature/feature.xml @@ -121,5 +121,4 @@ This Agreement is governed by the laws of the State of New York and the intellec install-size="0" version="0.0.0" unpack="false"/> - </feature> |