cocoon-docs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@cocoon.apache.org
Subject [Cocoon Wiki] Updated: MergingBranches
Date Tue, 05 Oct 2004 08:51:14 GMT
   Date: 2004-10-05T01:51:14
   Editor: CarstenZiegeler <cziegeler@apache.org>
   Wiki: Cocoon Wiki
   Page: MergingBranches
   URL: http://wiki.apache.org/cocoon/MergingBranches

   no comment

Change Log:

------------------------------------------------------------------------------
@@ -2,11 +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/samples
-   {{{
-   src/samples/org/apache/cocoon/samples/parentcm/Generator.java
-   src/samples/org/apache/cocoon/acting/modular/TestAction.java
-   }}}
  * src/test
    {{{
    src/test/org/apache/cocoon/environment/mock/MockRequest.java
@@ -248,6 +243,7 @@
  * src/java
  * src/mocks
  * src/resources
+ * src/samples
  * misc
  * tools
 Blocks:

Mime
View raw message