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 /plugins/org.eclipse.etrice.core.room.ui/etrice-development.target | |
| 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 'plugins/org.eclipse.etrice.core.room.ui/etrice-development.target')
| -rw-r--r-- | plugins/org.eclipse.etrice.core.room.ui/etrice-development.target | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/plugins/org.eclipse.etrice.core.room.ui/etrice-development.target b/plugins/org.eclipse.etrice.core.room.ui/etrice-development.target index 331006757..21709c1e7 100644 --- a/plugins/org.eclipse.etrice.core.room.ui/etrice-development.target +++ b/plugins/org.eclipse.etrice.core.room.ui/etrice-development.target @@ -1,18 +1,18 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.6"?>
-
-<target name="eTrice development" sequenceNumber="15">
-<locations>
-<location path="${eTriceTargetInstallationPath}" type="Directory"/>
-</locations>
-<environment>
-<os>win32</os>
-<ws>win32</ws>
-<arch>x86</arch>
-<nl>de_DE</nl>
-</environment>
-<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_17"/>
-<launcherArgs>
-<vmArgs>-Xms40m -Xmx384m</vmArgs>
-</launcherArgs>
-</target>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?pde version="3.6"?> + +<target name="eTrice development" sequenceNumber="15"> +<locations> +<location path="${eTriceTargetInstallationPath}" type="Directory"/> +</locations> +<environment> +<os>win32</os> +<ws>win32</ws> +<arch>x86</arch> +<nl>de_DE</nl> +</environment> +<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_17"/> +<launcherArgs> +<vmArgs>-Xms40m -Xmx384m</vmArgs> +</launcherArgs> +</target> |