commit 6c2c5106cb3fa11240beda42d193c5961788c256
Merge: 2198103 a83acd1
Author: Alex Lehmann <alexl...@gmail.com>
AuthorDate: Thu Mar 15 19:11:31 2012 +0100
Commit: Alex Lehmann <alexl...@gmail.com>
CommitDate: Thu Mar 15 19:11:31 2012 +0100
Merge remote-tracking branch 'remotes/upstream/master'
Changed files:
M
jbehave-core/src/main/java/org/jbehave/core/steps/ParameterConverters.java
M
jbehave-core/src/test/java/org/jbehave/core/steps/ParameterConvertersBehaviour.java
M distribution/src/site/content/dependencies.html
M jbehave-ant/pom.xml
M jbehave-core/pom.xml
M jbehave-google/pom.xml
M jbehave-groovy/pom.xml
M jbehave-guice/pom.xml
M jbehave-maven-plugin/pom.xml
M jbehave-odf/pom.xml
M jbehave-pico/pom.xml
M jbehave-scala/pom.xml
M jbehave-spring/pom.xml
M jbehave-weld/pom.xml
A
jbehave-core/src/test/java/org/jbehave/core/io/LoadFromRelativeFileTest.java
A jbehave-core/src/test/resources/test+dir/dummy.story
M jbehave-core/src/main/java/org/jbehave/core/io/CodeLocations.java
M jbehave-core/src/main/java/org/jbehave/core/io/LoadFromRelativeFile.java
M jbehave-core/src/main/java/org/jbehave/core/io/StoryFinder.java
M
jbehave-core/src/main/java/org/jbehave/core/reporters/FilePrintStreamFactory.java
M
jbehave-core/src/test/java/org/jbehave/core/io/CodeLocationsBehaviour.java
