Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2012-04-27 10:48:16 -0400
committerHenrik Rentz-Reichert2012-04-27 10:48:16 -0400
commit2710771b3e8bcd68b1ac065b687f0bac2c9ecaec (patch)
treebae6caa69c0df4ac17a636041a77f30aef3d6291 /plugins/org.eclipse.etrice.logging
parent6e2f1d9d1a0476c51d3aa033b0c69be132c4e2e9 (diff)
parent2653d554de8a904dc3161d77e91543596da834cf (diff)
downloadorg.eclipse.etrice-2710771b3e8bcd68b1ac065b687f0bac2c9ecaec.tar.gz
org.eclipse.etrice-2710771b3e8bcd68b1ac065b687f0bac2c9ecaec.tar.xz
org.eclipse.etrice-2710771b3e8bcd68b1ac065b687f0bac2c9ecaec.zip
Merge branch 'state_machine_inheritance'
Conflicts: plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/RoomParser.java plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g 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.ui/src/org/eclipse/etrice/core/ui/labeling/RoomLabelProvider.java plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parseTreeConstruction/RoomParsetreeConstructor.java plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoomParser.java plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomFactory.java plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/RoomPackage.java plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomFactoryImpl.java plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/impl/RoomPackageImpl.java plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/util/RoomAdapterFactory.java plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/room/util/RoomSwitch.java plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/naming/RoomQualifiedNameProvider.java plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/room/util/RoomHelpers.java plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/RoomJavaValidator.java plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/etricegen/impl/ExpandedActorClassImpl.java plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/extensions/RoomExtensions.xtend plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/extensions/RoomExtensions.java plugins/org.eclipse.etrice.logging/.gitignore plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/dialogs/StatePropertyDialog.java runtime/org.eclipse.etrice.runtime.c/Debug/liborg.eclipse.etrice.runtime.c.a
Diffstat (limited to 'plugins/org.eclipse.etrice.logging')
-rw-r--r--plugins/org.eclipse.etrice.logging/.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/plugins/org.eclipse.etrice.logging/.gitignore b/plugins/org.eclipse.etrice.logging/.gitignore
index 4cbd3a6b8..84d383f25 100644
--- a/plugins/org.eclipse.etrice.logging/.gitignore
+++ b/plugins/org.eclipse.etrice.logging/.gitignore
@@ -1,4 +1,7 @@
bin
+<<<<<<< HEAD
+=======
+>>>>>>> refs/heads/state_machine_inheritance

Back to the top