commit 6ad5843bb7a2fe025e6ab9b98294a8323aea817f
Merge: 22759bd 6ed59b9
Author: Alex Lehmann <[email protected]>
AuthorDate: Wed Dec 28 23:19:40 2011 +0100
Commit: Alex Lehmann <[email protected]>
CommitDate: Wed Dec 28 23:19:40 2011 +0100
Merge remote-tracking branch 'remotes/upstream/master'
Changed files:
M archetypes/jbehave-groovy-archetype/pom.xml
M archetypes/jbehave-guice-archetype/pom.xml
M archetypes/jbehave-pico-archetype/pom.xml
M archetypes/jbehave-simple-archetype/pom.xml
M archetypes/jbehave-spring-archetype/pom.xml
M archetypes/pom.xml
M distribution/pom.xml
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-hudson-plugin/pom.xml
M jbehave-jenkins-plugin/pom.xml
M jbehave-maven-plugin/pom.xml
M jbehave-navigator/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
M pom.xml
M jbehave-core/src/main/java/org/jbehave/core/embedder/Embedder.java
M jbehave-core/src/main/java/org/jbehave/core/embedder/StoryManager.java
A jbehave-navigator/pom.xml
A jbehave-navigator/src/main/resources/images/bg.gif
A jbehave-navigator/src/main/resources/images/failing_screenshot.png
A jbehave-navigator/src/main/resources/images/jbehave-logo.png
A jbehave-navigator/src/main/resources/images/left-sidebar.gif
A jbehave-navigator/src/main/resources/images/min-width.gif
A jbehave-navigator/src/main/resources/images/orange-arrow-down.png
A jbehave-navigator/src/main/resources/images/orange-arrow-up.png
A jbehave-navigator/src/main/resources/images/passed-false.png
A jbehave-navigator/src/main/resources/images/passed-true.png
A jbehave-navigator/src/main/resources/images/stripe.png
A jbehave-navigator/src/main/resources/images/tab.png
A
jbehave-navigator/src/main/resources/images/ui-bg_flat_0_aaaaaa_40x100.png
A
jbehave-navigator/src/main/resources/images/ui-bg_flat_75_ffffff_40x100.png
A
jbehave-navigator/src/main/resources/images/ui-bg_glass_55_fbf9ee_1x400.png
A
jbehave-navigator/src/main/resources/images/ui-bg_glass_65_ffffff_1x400.png
A
jbehave-navigator/src/main/resources/images/ui-bg_glass_75_dadada_1x400.png
A
jbehave-navigator/src/main/resources/images/ui-bg_glass_75_e6e6e6_1x400.png
A
jbehave-navigator/src/main/resources/images/ui-bg_glass_95_fef1ec_1x400.png
A
jbehave-navigator/src/main/resources/images/ui-bg_highlight-soft_75_cccccc_1x100.png
A jbehave-navigator/src/main/resources/images/ui-icons_222222_256x240.png
A jbehave-navigator/src/main/resources/images/ui-icons_2e83ff_256x240.png
A jbehave-navigator/src/main/resources/images/ui-icons_454545_256x240.png
A jbehave-navigator/src/main/resources/images/ui-icons_888888_256x240.png
A jbehave-navigator/src/main/resources/images/ui-icons_cd0a0a_256x240.png
A jbehave-navigator/src/main/resources/js/angular-0.9.11.min.js
A jbehave-navigator/src/main/resources/js/cornerz-0.6.js
A jbehave-navigator/src/main/resources/js/jquery-1.5.1.min.js
A jbehave-navigator/src/main/resources/js/jquery-framedialog-1.1.2.js
A jbehave-navigator/src/main/resources/js/jquery-ui.min-1.7.1.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shAutoloader.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shBrushAS3.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shBrushAppleScript.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shBrushBash.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shBrushCSharp.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shBrushColdFusion.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shBrushCpp.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shBrushCss.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shBrushDelphi.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shBrushDiff.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shBrushErlang.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shBrushGroovy.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shBrushJScript.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shBrushJava.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shBrushJavaFX.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shBrushPerl.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shBrushPhp.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shBrushPlain.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shBrushPowerShell.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shBrushPython.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shBrushRuby.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shBrushSass.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shBrushScala.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shBrushSql.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shBrushVb.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shBrushXml.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shCore.js
A jbehave-navigator/src/main/resources/js/sh-3.0.83/shLegacy.js
A jbehave-navigator/src/main/resources/js/shBrushBdd.js
A jbehave-navigator/src/main/resources/navigator.html
A jbehave-navigator/src/main/resources/style/jquery-ui.css
A jbehave-navigator/src/main/resources/style/navigator.css
M distribution/src/site/content/maven-goals.html
M
jbehave-maven-plugin/src/main/java/org/jbehave/mojo/UnpackViewResources.java
M
jbehave-maven-plugin/src/test/java/org/jbehave/mojo/EmbedderMojoBehaviour.java
M README.md
M distribution/src/site/content/building-source.html
