Date: 2004-10-04T16:43:24
Editor: VadimGritsenko <[EMAIL PROTECTED]>
Wiki: Cocoon Wiki
Page: MergingBranches
URL: http://wiki.apache.org/cocoon/MergingBranches
no comment
Change Log:
------------------------------------------------------------------------------
@@ -2,10 +2,6 @@
This page helps keeping track of merging back the changes already done in the
2.2-dev repository (trunk) to the 2.1.x branch.
== Not Merged ==
- * src/confpatch
- {{{
- src/confpatch/enable-instrumentation.xweb
- }}}
* src/samples
{{{
src/samples/org/apache/cocoon/samples/parentcm/Generator.java
@@ -268,6 +264,7 @@
}}}
== Already Merged ==
+ * src/confpatch
* src/deprecated
* src/documentation
* src/java
