[jbehave-scm] [scm-core/jbehave-4.x][3/3] Merge branch 'jbehave-4.x' of ssh://git.codehaus.org/jbehave-core into jbehave-4.x

Fri, 21 Dec 2012 01:48:38 -0800 

commit 2e52833525116d8040ce4aa34e0f0a5ee5e22a6a
Merge: 653eede fe69aa2
Author:     Mauro Talevi <[email protected]>
AuthorDate: Fri, 21 Dec 2012 10:48:13 +0100
Commit:     Mauro Talevi <[email protected]>
CommitDate: Fri, 21 Dec 2012 10:48:13 +0100

    Merge branch 'jbehave-4.x' of ssh://git.codehaus.org/jbehave-core into 
jbehave-4.x
    
    Conflicts:
        
jbehave-core/src/test/java/org/jbehave/core/io/JarFileScannerBehaviour.java

Changed files:

M       
jbehave-core/src/test/java/org/jbehave/core/io/JarFileScannerBehaviour.java
M       jbehave-core/src/test/java/org/jbehave/core/io/StoryFinderBehaviour.java

Reply via email to