Date: 2004-10-21T08:48:15
Editor: UnicoHommes <[EMAIL PROTECTED]>
Wiki: Cocoon Wiki
Page: MergingBranches
URL: http://wiki.apache.org/cocoon/MergingBranches
Slide block was merged
Change Log:
------------------------------------------------------------------------------
@@ -176,15 +176,6 @@
src/blocks/scratchpad/conf/delay-refresher.xconf
src/blocks/scratchpad/garbage/source/java/org/apache/garbage/serializer/XMLSerializer.java
}}}
- * slide
- {{{
- src/blocks/slide/java/org/apache/cocoon/slide/util/AdminHelper.java
-
src/blocks/slide/java/org/apache/cocoon/components/slide/impl/SlideConfigurationAdapter.java
- src/blocks/slide/samples/flow.js
- src/blocks/slide/samples/screens/users.jx
- src/blocks/slide/samples/screens/permissions.jx
- src/blocks/slide/samples/screens/locks.jx
- }}}
* xsp
{{{
src/blocks/xsp/java/org/apache/cocoon/acting/ServerPagesAction.java
@@ -246,6 +237,7 @@
* repository
* serializers
* Session-FW
+ * slide
* slop
* stx
* taglib
