Date: 2004-11-16T15:47:09
   Editor: AntonioGallardo <[EMAIL PROTECTED]>
   Wiki: Cocoon Wiki
   Page: MergingBranches
   URL: http://wiki.apache.org/cocoon/MergingBranches

   no comment

Change Log:

------------------------------------------------------------------------------
@@ -75,32 +75,8 @@
    }}}
  * src/webapp
    {{{
-   src/webapp/samples/test/sendpage-redirect/explain-test.xml
-   src/webapp/samples/test/reader-mime-type/explain-test.xml
-   src/webapp/samples/common/style/xsl/html/simple-page2html.xsl
-   src/webapp/samples/hello-world/style/swf/hello.swf
-   src/webapp/samples/hello-world/style/swf/hello.fla
-   src/webapp/samples/hello-world/style/xsl/page2html.xsl
-   src/webapp/samples/hello-world/style/xsl/page2swf.xsl
-   src/webapp/samples/hello-world/samples.xml
-   src/webapp/samples/hello-world/sitemap.xmap
-   src/webapp/samples/text-wrap/welcome.html
-   src/webapp/samples/errorhandling/samples.xml
-   src/webapp/samples/sitemap.xmap
-   src/webapp/samples/flow/jxcalc/screens/getNumberA.xml
-   src/webapp/samples/modules/menu.xml
-   src/webapp/samples/modules/menu2content.xsl
-   src/webapp/samples/modules/sitemap.xmap
-   src/webapp/samples/modules/properties.xml
-   src/webapp/samples/modules/menu2navigation.xsl
-   src/webapp/samples/modules/menu2html.xsl
-   src/webapp/samples/modules/index.xhtml
-   src/webapp/sitemap.xmap
-   src/webapp/WEB-INF/log4j.xconf
    src/webapp/WEB-INF/web.xml
    src/webapp/WEB-INF/cocoon.xconf
-   src/webapp/resources/styles/main.css
-   src/webapp/stylesheets/system/error2html.xslt
    }}}
  * Libs, Legal, and gump.xml
    {{{