commit 5370e232bf9186cc0fa988832af3a42d2fbba026
Merge: aef1a65 a764a1b
Author: Alex Lehmann <alexl...@gmail.com>
AuthorDate: Mon Aug 13 20:11:14 2012 +0200
Commit: Alex Lehmann <alexl...@gmail.com>
CommitDate: Mon Aug 13 20:11:14 2012 +0200
Merge remote-tracking branch 'remotes/upstream/master'
Conflicts:
jbehave-core/src/test/resources/story.html
jbehave-core/src/test/resources/story.xml
Changed files:
M
jbehave-core/src/test/java/org/jbehave/core/reporters/TemplateableOutputBehaviour.java
M jbehave-core/src/test/resources/story.html
M jbehave-core/src/test/resources/story.xml
M jbehave-core/src/main/java/org/jbehave/core/model/OutcomesTable.java
M jbehave-core/src/main/resources/ftl/jbehave-html-output.ftl
M jbehave-core/src/main/resources/ftl/jbehave-xml-output.ftl
M
jbehave-core/src/main/java/org/jbehave/core/reporters/TemplateableOutput.java
A jbehave-core/src/main/java/org/jbehave/core/reporters/EscapeMode.java
M
jbehave-core/src/test/java/org/jbehave/core/reporters/PrintStreamOutputBehaviour.java
M
jbehave-odf/src/test/java/org/jbehave/core/io/odf/OdtLoaderBehaviour.java
M
jbehave-core/src/main/java/org/jbehave/core/reporters/StackTraceFormatter.java
M
jbehave-core/src/test/java/org/jbehave/core/reporters/StackTraceFormatterBehaviour.java
