Date: 2004-10-31T14:38:06
   Editor: AntonioGallardo <[EMAIL PROTECTED]>
   Wiki: Cocoon Wiki
   Page: MergingBranches
   URL: http://wiki.apache.org/cocoon/MergingBranches

   no comment

Change Log:

------------------------------------------------------------------------------
@@ -161,7 +161,6 @@
    
src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom/AO_FOM_JavaScriptInterpreter.java
    
src/blocks/scratchpad/java/org/apache/cocoon/components/store/ehcache-defaults.xml
    src/blocks/scratchpad/java/org/apache/cocoon/components/store/EHStore.java
-   
src/blocks/scratchpad/java/org/apache/cocoon/transformation/BetwixtTransformer.java
    src/blocks/scratchpad/java/org/apache/cocoon/caching/IdentifierCacheKey.java
    src/blocks/scratchpad/java/org/apache/cocoon/util/SoftSourceCache.java
    src/blocks/scratchpad/samples/groovyflow/samples.xml