Date: 2004-10-15T06:56:13
Editor: VadimGritsenko <[EMAIL PROTECTED]>
Wiki: Cocoon Wiki
Page: MergingBranches
URL: http://wiki.apache.org/cocoon/MergingBranches
no comment
Change Log:
------------------------------------------------------------------------------
@@ -75,12 +75,11 @@
}}}
* Libs, Legal, and gump.xml
{{{
- src/blocks/xmldb/lib/xmlrpc-1.1.jar
-
src/blocks/html/lib/nekohtml-0.9.2.jar -- Pending a backporting of
NekoHTMLGenerator....
lib/optional/servlet-2_3.jar -- This is the 2.2 location. The 2.1.6-dev
location is below:
src/blocks/scratchpad/lib/servlet-2_3.jar
+
lib/optional/servlet_2_2.jar -- Deleted in 2.2. This library is currenlty
only in 2.1.6-dev.
// We use the same log4j version in both version. Is OK to move in
2.1.6-dev the library to core?
@@ -88,8 +87,8 @@
lib/core/log4j-1.2.8.jar
}}}
* Root Directory
- blocks.properties
status.xml
+
Blocks:
* html
{{{
