| commit | 540b4b5084174faaf3d80ac53c2de5d0f76be19f | [log] [tgz] |
|---|---|---|
| author | Edgar Mueller <edgar.m.mueller@gmail.com> | Sun Feb 24 16:37:02 2013 +0100 |
| committer | Edgar Mueller <edgar.m.mueller@gmail.com> | Sun Feb 24 16:37:02 2013 +0100 |
| tree | 1786a22f1f0f7237fa82f6cabb7e1cda8bdbd2f9 | |
| parent | c78a9e4d4e1b60cb53decab77d5b4d832906d5bf [diff] | |
| parent | 13cf842f02d96e1e413deb284156f118509250c0 [diff] |
Merge branch 'master' of ssh://git.eclipse.org/gitroot/emf-store/org.eclipse.emf.emfstore.other
diff --git a/ErrorReporting/org.eclipse.emf.emfstore.client.ui.errorreporting/src/org/eclipse/emf/emfstore/client/ui/errorreporting/EmfStoreExceptionObserver.java b/ErrorReporting/org.eclipse.emf.emfstore.client.ui.errorreporting/src/org/eclipse/emf/emfstore/client/ui/errorreporting/EmfStoreExceptionObserver.java index c2260fc..db68d6b 100644 --- a/ErrorReporting/org.eclipse.emf.emfstore.client.ui.errorreporting/src/org/eclipse/emf/emfstore/client/ui/errorreporting/EmfStoreExceptionObserver.java +++ b/ErrorReporting/org.eclipse.emf.emfstore.client.ui.errorreporting/src/org/eclipse/emf/emfstore/client/ui/errorreporting/EmfStoreExceptionObserver.java
@@ -19,8 +19,8 @@ import org.eclipse.core.runtime.Status; import org.eclipse.emf.emfstore.client.model.Configuration; import org.eclipse.emf.emfstore.client.model.exceptions.MissingCommandException; -import org.eclipse.emf.emfstore.client.model.observer.ESExceptionObserver; import org.eclipse.emf.emfstore.client.model.util.WorkspaceUtil; +import org.eclipse.emf.emfstore.client.observer.ESExceptionObserver; import org.eclipse.emf.emfstore.common.extensionpoint.ExtensionPoint; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.ui.PlatformUI;
diff --git a/Fuzzy/org.eclipse.emf.emfstore.fuzzy.emf.test/plugin.xml b/Fuzzy/org.eclipse.emf.emfstore.fuzzy.emf.test/plugin.xml index ea0197f..5504bb1 100644 --- a/Fuzzy/org.eclipse.emf.emfstore.fuzzy.emf.test/plugin.xml +++ b/Fuzzy/org.eclipse.emf.emfstore.fuzzy.emf.test/plugin.xml
@@ -2,7 +2,7 @@ <?eclipse version="3.4"?> <plugin> <extension - point="org.eclipse.emf.emfstore.client.recording.options"> + point="org.eclipse.emf.emfstore.client.recordingOptions"> <RecordingOptions cutOffIncomingCrossReferences="true"> </RecordingOptions>