| commit | bb1525c38e78231b5aaf0fd9043b4837e29af794 | [log] [tgz] |
|---|---|---|
| author | Johannes Faltermeier <jfaltermeier@eclipsesource.com> | Fri Nov 29 10:13:05 2013 +0100 |
| committer | Johannes Faltermeier <jfaltermeier@eclipsesource.com> | Fri Nov 29 10:13:05 2013 +0100 |
| tree | 3c3cccd95ddc0486c3c80b9876c82b4662730425 | |
| parent | 584de7c0d3149dfd0248a52c3256666b09a5b441 [diff] | |
| parent | aa2c2cfd34daf0f044f40901cff86c11515ad0f7 [diff] |
Merge branch 'origin/develop' Conflicts: bundles/org.eclipse.emf.emfstore.client/META-INF/MANIFEST.MF bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/ProjectSpaceBase.java bundles/org.eclipse.emf.emfstore.server/META-INF/MANIFEST.MF features/org.eclipse.emf.emfstore.backchannel.feature/feature.xml features/org.eclipse.emf.emfstore.client.feature/feature.xml features/org.eclipse.emf.emfstore.client.transaction.feature/feature.xml