Date: 2004-08-16T01:58:05
Editor: CarstenZiegeler <[EMAIL PROTECTED]>
Wiki: Cocoon Wiki
Page: MergingBranches
URL: http://wiki.apache.org/cocoon/MergingBranches
no comment
Change Log:
------------------------------------------------------------------------------
@@ -642,12 +642,6 @@
src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPFooter.java
src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EP_Bottom.java
}}}
- * Qdox
- {{{
-
src/blocks/qdox/java/org/apache/cocoon/components/source/impl/QDoxSourceFactory.java
-
src/blocks/qdox/java/org/apache/cocoon/components/source/impl/QDoxSource.java
- src/blocks/qdox/samples/stylesheets/qdox2html.xsl
- }}}
* repository
{{{
src/blocks/repository/java/org/apache/cocoon/components/repository/SourceRepositoryImpl.java
@@ -760,9 +754,11 @@
== Already Merged ==
* src/deprecated
+ * src/documentation
* src/mocks
* src/resources
* misc
+ * tools
Blocks:
* asciiart
* authentication-fw
@@ -786,6 +782,7 @@
* Profiler
* Proxy
* Python
+ * qdox
* Session-FW
* slop
* stx
