diff options
| author | Christian W. Damus | 2014-04-22 16:33:40 +0000 |
|---|---|---|
| committer | Christian W. Damus | 2014-04-22 16:33:40 +0000 |
| commit | ebde630de0593d0278d5ab36bfc024b3d9dc0737 (patch) | |
| tree | f2db080acfd99c5ea71331b80726672a4da0702f /plugins/infra/emf/org.eclipse.papyrus.infra.emf.newchild/.classpath | |
| parent | 1021d79f1ef9e27245464e445d795b8d336b57d4 (diff) | |
| parent | cd03d0c5e3808d3831f70679ff3c17a67c4b2873 (diff) | |
| download | org.eclipse.papyrus-ebde630de0593d0278d5ab36bfc024b3d9dc0737.tar.gz org.eclipse.papyrus-ebde630de0593d0278d5ab36bfc024b3d9dc0737.tar.xz org.eclipse.papyrus-ebde630de0593d0278d5ab36bfc024b3d9dc0737.zip | |
Merge branch 'refs/heads/master' into bugs/431953-stereo-repair2
Conflicts:
plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/internal/participants/StereotypeApplicationRepairParticipant.java
Diffstat (limited to 'plugins/infra/emf/org.eclipse.papyrus.infra.emf.newchild/.classpath')
| -rw-r--r-- | plugins/infra/emf/org.eclipse.papyrus.infra.emf.newchild/.classpath | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.newchild/.classpath b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.newchild/.classpath index 2ca72baf8d0..ae46291dfda 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.newchild/.classpath +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.newchild/.classpath @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry excluding="org/eclipse/papyrus/infra/emf/newchild/action/ExtendedTypeAction.java" kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src-gen"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="output" path="bin"/> +</classpath>
\ No newline at end of file |