Date: 2004-08-11T03:12:11 Editor: CarstenZiegeler <[EMAIL PROTECTED]> Wiki: Cocoon Wiki Page: MergingBranches URL: http://wiki.apache.org/cocoon/MergingBranches
no comment Change Log: ------------------------------------------------------------------------------ @@ -44,39 +44,38 @@ * src/mocks * src/resources * misc -Blocks:\\ -- asciiart\\ -- authentication-fw\\ -- axis -- batik -- bsf (see below) -- Deli -- fop -- hsqldb -- itext -- jfor -- jsp -- linotype -- Mail -- Naming -- Paranoid -- Petstore -- Php -- Portal (see below) -- Portal-FW -- Profiler -- Proxy -- Python -- Session-FW -- slop -- stx -- taglib -- Velocity -- web3 -- Woody +Blocks: + * asciiart + * authentication-fw + * axis + * batik + * bsf (see below) + * Deli + * fop + * hsqldb + * itext + * jfor + * jsp + * linotype + * Mail + * Naming + * Paranoid + * Petstore + * Php + * Portal (see below) + * Portal-FW + * Profiler + * Proxy + * Python + * Session-FW + * slop + * stx + * taglib + * Velocity + * web3 + * Woody Questions --------- -- bsf has in 2.2 support for groovy, do we want to merge this? -- Portal: ManagedCocoonPortlet is not merged, should we? - + * bsf has in 2.2 support for groovy, do we want to merge this? + * Portal: ManagedCocoonPortlet is not merged, should we?
