URL: https://svn.lrde.epita.fr/svn/oln/branches Index: README.branches =================================================================== --- README.branches (revision 2921) +++ README.branches (revision 2922) @@ -2,7 +2,7 @@ * cleanup-2008 -** Status: OPEN +** Status: CLOSED ** Object: Cleanup of Olena 1.0 Should be merged back, then closed, as soon as all cleanup changes have been applied. @@ -14,6 +14,8 @@ on 2008-09-05 by Guillaume Lazzara. - Sync'd (merge) trunk (r2189:2315) into cleanup-2008 by (the set of) revisions 2316..2335 on 2008-09-17 by Roland Levillain. +- Merge back cleanup-2008 (r2335:2920) into trunk by revision 2921 by + Roland Levillain, and ``close'' branch (although not deleted). rev. branches @@ -45,15 +47,19 @@ | | . 2335 | `o | | - ... | | + | . + ... | . + | . | | - v | - trunk | - | - v - branches/cleanup-2008 +2920 | .o close branches/cleanup-2008 + | / +2921 o' merge branches/cleanup-2008 (r2335:2920) -> trunk + | + ... | + | + v + trunk - * olena-ng ** Status: OPEN ** Object: Olena NG (Next Generation), based on the SCOOP 2 paradigm