Date: 2004-08-11T03:08:33 Editor: CarstenZiegeler <[EMAIL PROTECTED]> Wiki: Cocoon Wiki Page: MergingBranches URL: http://wiki.apache.org/cocoon/MergingBranches
no comment Change Log: ------------------------------------------------------------------------------ @@ -1,52 +1,52 @@ This page helps keeping track of merging back the changes already done in the 2.2-dev repository to the 2.1.x branch. -Not Merged (or not checked) ----------- -- src/Core -- src/confpatch -- src/documentation -- src/samples -- src/test -- src/webapp -- Libs (and legal) and gump.xml -- Complete Tools Directory -- blocks.properties -- build.properties -- status.xml -Blocks: -- Apples -- Chaperon -- Cron -- Databases -- Eventcache -- Forms -- html -- javaflow -- jms -- linkrewriter -- lucene -- Midi -- Ojb -- Poi -- Qdox -- repository -- scratchpad -- serializers -- slide -- tour -- webdav -- xmldb -- xsp +Not Merged (or not checked)\\ +----------\\ +- src/Core\\ +- src/confpatch\\ +- src/documentation\\ +- src/samples\\ +- src/test\\ +- src/webapp\\ +- Libs (and legal) and gump.xml\\ +- Complete Tools Directory\\ +- blocks.properties\\ +- build.properties\\ +- status.xml\\ +Blocks:\\ +- Apples\\ +- Chaperon\\ +- Cron\\ +- Databases\\ +- Eventcache\\ +- Forms\\ +- html\\ +- javaflow\\ +- jms\\ +- linkrewriter\\ +- lucene\\ +- Midi\\ +- Ojb\\ +- Poi\\ +- Qdox\\ +- repository\\ +- scratchpad\\ +- serializers\\ +- slide\\ +- tour\\ +- webdav\\ +- xmldb\\ +- xsp\\ -Already Merged --------------- -- src/deprecated -- src/mocks -- src/resources -- misc -Blocks: -- asciiart -- authentication-fw +Already Merged\\ +--------------\\ +- src/deprecated\\ +- src/mocks\\ +- src/resources\\ +- misc\\ +Blocks:\\ +- asciiart\\ +- authentication-fw\\ - axis - batik - bsf (see below)
