diff options
| author | Henrik Rentz-Reichert | 2018-07-06 17:19:51 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2018-07-06 17:22:00 +0000 |
| commit | 0509ac03bea494b08a92251e68e9efc92e415a20 (patch) | |
| tree | d070ca8800c829827df8aff75c1b773fe1115908 /tests/org.eclipse.etrice.ui.structure.tests | |
| parent | c2dfdeabf15d7e367bcd92731e6ac8651ffb9cac (diff) | |
| parent | bed42b94fbf934db15e792b247ee747f0c37ebf4 (diff) | |
| download | org.eclipse.etrice-0509ac03bea494b08a92251e68e9efc92e415a20.tar.gz org.eclipse.etrice-0509ac03bea494b08a92251e68e9efc92e415a20.tar.xz org.eclipse.etrice-0509ac03bea494b08a92251e68e9efc92e415a20.zip | |
Merge remote-tracking branch 'newfsmgen_finalize'
Conflicts:
plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF
plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF
Change-Id: Icc81a851cdcdb35081b8eaa3d5b025c1f850de54
Diffstat (limited to 'tests/org.eclipse.etrice.ui.structure.tests')
| -rw-r--r-- | tests/org.eclipse.etrice.ui.structure.tests/org.eclipse.etrice.ui.structure.tests.launch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/org.eclipse.etrice.ui.structure.tests/org.eclipse.etrice.ui.structure.tests.launch b/tests/org.eclipse.etrice.ui.structure.tests/org.eclipse.etrice.ui.structure.tests.launch index 0550a9654..7a69f51e9 100644 --- a/tests/org.eclipse.etrice.ui.structure.tests/org.eclipse.etrice.ui.structure.tests.launch +++ b/tests/org.eclipse.etrice.ui.structure.tests/org.eclipse.etrice.ui.structure.tests.launch @@ -32,7 +32,7 @@ <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.etrice.ui.structure.tests"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Xmx512m -Xms128m -XX:PermSize=32m -XX:MaxPermSize=256m -Dfile.encoding=UTF-8 -Dosgi.requiredJavaVersion=1.5"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Xmx512m -Xms128m -Dfile.encoding=UTF-8 -Dosgi.requiredJavaVersion=1.5"/> <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.platform.ide"/> <booleanAttribute key="run_in_ui_thread" value="true"/> |