Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2013-04-05 08:17:20 -0400
committerHenrik Rentz-Reichert2013-04-05 08:17:20 -0400
commit5fed141dbc4a040b686870aff11e2a79e19554ca (patch)
treee365e0d86b86a20c572b310672e79e71e629fb88 /features
parent24957af9c881a28886ca334de4c7c1e3a8bbd35c (diff)
parentd5d02973f16a8a05c79dcf42f5e1bdb2d4f23930 (diff)
downloadorg.eclipse.etrice-5fed141dbc4a040b686870aff11e2a79e19554ca.tar.gz
org.eclipse.etrice-5fed141dbc4a040b686870aff11e2a79e19554ca.tar.xz
org.eclipse.etrice-5fed141dbc4a040b686870aff11e2a79e19554ca.zip
Merge branch 'change/11464/1'
Conflicts: plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/StateMachineGen.java plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ConfigGenAddon.java plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/SubSystemClassGen.java plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.xtend plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/VariableServiceGen.xtend plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ConfigGenAddon.java plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/VariableServiceGen.java plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/commands/StateGraphContext.java tests/org.eclipse.etrice.ui.behavior.tests/models/InheritedStateMachine.room
Diffstat (limited to 'features')
-rw-r--r--features/org.eclipse.etrice.feature/feature.xml38
-rw-r--r--features/org.eclipse.etrice.tests.feature/feature.xml10
2 files changed, 24 insertions, 24 deletions
diff --git a/features/org.eclipse.etrice.feature/feature.xml b/features/org.eclipse.etrice.feature/feature.xml
index ba589f18b..59f603a4c 100644
--- a/features/org.eclipse.etrice.feature/feature.xml
+++ b/features/org.eclipse.etrice.feature/feature.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- <copyright>
-
- Copyright (c) 2010 - 2011 Protos Software GmbH.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- Henrik Rentz-Reichert
-
- </copyright>
-
+<!--
+ <copyright>
+
+ Copyright (c) 2010 - 2011 Protos Software GmbH.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Henrik Rentz-Reichert
+
+ </copyright>
+
-->
<feature
id="org.eclipse.etrice.feature"
@@ -28,11 +28,11 @@
</description>
<copyright url="http://www.eclipse.org/legal/epl-v10.html">
- (c) 2010 - 2011 Protos Software GmbH.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License
-v1.0
-which accompanies this distribution, and is available at
+ (c) 2010 - 2011 Protos Software GmbH.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License
+v1.0
+which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
</copyright>
diff --git a/features/org.eclipse.etrice.tests.feature/feature.xml b/features/org.eclipse.etrice.tests.feature/feature.xml
index 4d2e21a2e..d8d699fd5 100644
--- a/features/org.eclipse.etrice.tests.feature/feature.xml
+++ b/features/org.eclipse.etrice.tests.feature/feature.xml
@@ -10,11 +10,11 @@
</description>
<copyright url="http://www.eclipse.org/legal/epl-v10.html">
- (c) 2010 - 2011 Protos Software GmbH.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License
-v1.0
-which accompanies this distribution, and is available at
+ (c) 2010 - 2011 Protos Software GmbH.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License
+v1.0
+which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
</copyright>

Back to the top