diff options
| author | Thomas Schuetz | 2013-07-12 08:40:15 +0000 |
|---|---|---|
| committer | Thomas Schuetz | 2013-07-12 08:40:15 +0000 |
| commit | 12cda553738ca88662624b6f47066b5564549648 (patch) | |
| tree | bfa65b6c38aa566a5f1cc98395da6546a6c6e282 /examples/my.etrice.generator.launch/.classpath | |
| parent | 3447749b1a453735ac54fc09ea7680acdbb19b69 (diff) | |
| parent | d65e1d1bdd43feadb43261b85aac2d8aef5e089c (diff) | |
| download | org.eclipse.etrice-12cda553738ca88662624b6f47066b5564549648.tar.gz org.eclipse.etrice-12cda553738ca88662624b6f47066b5564549648.tar.xz org.eclipse.etrice-12cda553738ca88662624b6f47066b5564549648.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
Change-Id: I98e2df3ab57d6e7e8f27e5b0aee7eaa189bfbc33
Diffstat (limited to 'examples/my.etrice.generator.launch/.classpath')
| -rw-r--r-- | examples/my.etrice.generator.launch/.classpath | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/examples/my.etrice.generator.launch/.classpath b/examples/my.etrice.generator.launch/.classpath index 8a8f1668c..ad32c83a7 100644 --- a/examples/my.etrice.generator.launch/.classpath +++ b/examples/my.etrice.generator.launch/.classpath @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> |