Date: 2004-08-30T08:02:10
Editor: CarstenZiegeler <[EMAIL PROTECTED]>
Wiki: Cocoon Wiki
Page: MergingBranches
URL: http://wiki.apache.org/cocoon/MergingBranches
no comment
Change Log:
------------------------------------------------------------------------------
@@ -2,14 +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/java
- {{{
- src/java/org/apache/cocoon/components/flow/InterpreterSelector.java
- src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
-
src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
- src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java
- src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
- }}}
* src/confpatch
{{{
src/confpatch/enable-instrumentation.xweb
@@ -379,6 +371,7 @@
== Already Merged ==
* src/deprecated
* src/documentation
+ * src/java
* src/mocks
* src/resources
* misc
