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 /plugins/org.eclipse.etrice.logging
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 'plugins/org.eclipse.etrice.logging')
-rw-r--r--plugins/org.eclipse.etrice.logging/bin/log4j.properties7
1 files changed, 0 insertions, 7 deletions
diff --git a/plugins/org.eclipse.etrice.logging/bin/log4j.properties b/plugins/org.eclipse.etrice.logging/bin/log4j.properties
deleted file mode 100644
index 4bb6f37ad..000000000
--- a/plugins/org.eclipse.etrice.logging/bin/log4j.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-log4j.rootCategory=INFO, S
-
-log4j.logger.org.eclipse.xtext=INFO
-
-log4j.appender.S = org.apache.log4j.ConsoleAppender
-log4j.appender.S.layout = org.apache.log4j.PatternLayout
-log4j.appender.S.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss} %c{1} [%p] %m%n

Back to the top