Date: 2004-10-15T05:03:47
   Editor: SylvainWallez <[EMAIL PROTECTED]>
   Wiki: Cocoon Wiki
   Page: MergingBranches
   URL: http://wiki.apache.org/cocoon/MergingBranches

   no comment

Change Log:

------------------------------------------------------------------------------
@@ -100,8 +100,6 @@
    src/blocks/html/conf/tidy.xmap
    src/blocks/html/WEB-INF/tidy.properties
    }}}
- * forms
-   VARIOUS CHANGES
  * javaflow
    {{{
    
src/blocks/javaflow/test/org/apache/cocoon/components/flow/java/test/InnerContinuable.java
@@ -223,7 +221,7 @@
  * Deli
  * eventcache
  * fop
- * forms
+ * forms (some new features added by Tim are kept in 2.2 only for now)
  * hsqldb
  * itext
  * jfor

Reply via email to