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 Fri, 15 Oct 2004 07:04:09 GMT
   Date: 2004-10-15T00:04:09
   Editor: CarstenZiegeler <cziegeler@apache.org>
   Wiki: Cocoon Wiki
   Page: MergingBranches
   URL: http://wiki.apache.org/cocoon/MergingBranches

   no comment

Change Log:

------------------------------------------------------------------------------
@@ -191,34 +191,6 @@
    src/blocks/slide/samples/screens/permissions.jx
    src/blocks/slide/samples/screens/locks.jx
    }}}
- * tour
-   {{{
-   src/blocks/tour/java/org/apache/cocoon/samples/tour/shapes/Square.java
-   src/blocks/tour/java/org/apache/cocoon/samples/tour/shapes/Shape.java
-   src/blocks/tour/java/org/apache/cocoon/samples/tour/shapes/Circle.java
-   src/blocks/tour/java/org/apache/cocoon/samples/tour/shapes/Rectangular.java
-   src/blocks/tour/samples/flow/java-shapes/square.xml
-   src/blocks/tour/samples/flow/java-shapes/circle.xml
-   src/blocks/tour/samples/flow/java-shapes/results.xml
-   src/blocks/tour/samples/flow/java-shapes/rectangular.xml
-   src/blocks/tour/samples/flow/java-shapes/java-shapes.js
-   src/blocks/tour/samples/flow/java-shapes/select.xml
-   src/blocks/tour/samples/flow/sitemap.xmap
-   src/blocks/tour/samples/flow/docs/java-shapes.xml
-   src/blocks/tour/samples/flow/docs/multi-page.xml
-   src/blocks/tour/samples/flow/docs/index.xml
-   src/blocks/tour/samples/flow/docs/number-guess.xml
-   src/blocks/tour/samples/flow/number-guess/guess.xml
-   src/blocks/tour/samples/bean-editor/docs/forms.xml
-   src/blocks/tour/samples/bean-editor/docs/index.xml
-   src/blocks/tour/samples/bean-editor/docs/javabeans.xml
-   src/blocks/tour/samples/bean-editor/docs/tasklist.xml
-   src/blocks/tour/samples/intro/docs/facts.xml
-   src/blocks/tour/samples/intro/docs/bizlayer.xml
-   src/blocks/tour/samples/intro/docs/toc.xml
-   src/blocks/tour/samples/intro/docs/use-cases.xml
-   src/blocks/tour/samples/intro/presentation/tour.css
-   }}}
  * webdav
    {{{
    src/blocks/webdav/test/org/apache/cocoon/components/source/impl/WebDAVSourceTestCase.java
@@ -287,6 +259,7 @@
  * slop
  * stx
  * taglib
+ * tour
  * velocity
  * web3
  * woody

Mime
View raw message