Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2012-03-30 13:41:35 -0400
committerHenrik Rentz-Reichert2012-03-30 13:41:35 -0400
commitbd23445793c15413b9776c3a06190aee0cf1fd5b (patch)
tree746c5009ccb8c690e43deac16216937f0837fbd2 /features
parent213090ec7d3e3f620cf691db3a37aace2a01b860 (diff)
parentfa1389ea9d79ef5976ba7b68b6fd5cabb841a564 (diff)
downloadorg.eclipse.etrice-bd23445793c15413b9776c3a06190aee0cf1fd5b.tar.gz
org.eclipse.etrice-bd23445793c15413b9776c3a06190aee0cf1fd5b.tar.xz
org.eclipse.etrice-bd23445793c15413b9776c3a06190aee0cf1fd5b.zip
Merge remote branch 'refs/remotes/origin/master'
Conflicts: plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoomLexer.java plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoomParser.java plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoomLexer.java plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoomParser.java plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/RoomJavaValidator.java
Diffstat (limited to 'features')
-rw-r--r--features/org.eclipse.etrice.tests.feature/feature.xml2
1 files changed, 0 insertions, 2 deletions
diff --git a/features/org.eclipse.etrice.tests.feature/feature.xml b/features/org.eclipse.etrice.tests.feature/feature.xml
index 670690526..3c71eb0b3 100644
--- a/features/org.eclipse.etrice.tests.feature/feature.xml
+++ b/features/org.eclipse.etrice.tests.feature/feature.xml
@@ -30,14 +30,12 @@ http://www.eclipse.org/legal/epl-v10.html
<import plugin="org.eclipse.core.runtime" version="3.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui" version="3.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.etrice.generator" version="0.1.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.etrice.modellib" version="0.1.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.etrice.generator.java" version="0.1.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.mwe.utils" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.apache.log4j" version="1.2.15" match="greaterOrEqual"/>
<import plugin="org.apache.commons.logging" version="1.0.4" match="greaterOrEqual"/>
<import plugin="org.eclipse.jface.text" version="3.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.core" version="3.6.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.xtend.util.stdlib" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.resources" version="3.6.0" match="greaterOrEqual"/>
<import plugin="org.junit4" version="4.8.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.generator" version="2.0.0" match="greaterOrEqual"/>

Back to the top