Revision as of 13:08, 3 December 2013

Merge state of branch kalypso_13.5

Merge	Target	Merger	Repository	Merged Revisions
xx.03.2013	trunk	Gernot Belger	kalypsobase	- 48161
			kalypso	- 21530
x	trunk	Gernot Belger	kalypsobase	x
			kalypso	x

@@ Line 5: / Line 5: @@
 ! Merge !! Target !! Merger !! Repository !! Merged Revisions
 |-
-| 17.02.2013 || kalypso_12.11|| Gernot Belger || kalypsobase ||  - 47671
+| xx.03.2013 || trunk || Gernot Belger || kalypsobase ||  - 48161
 |-
-| || || || kalypso || - 21097
+| || || || kalypso || - 21530
 |-
-| x || kalypso_12.11|| Gernot Belger || kalypsobase || x
+| x || trunk || Gernot Belger || kalypsobase || x
 |-
 | || || || kalypso || x
 |-
 |}
----++ xx.03.2013 nach trunk
-%TABLE{ tableborder="1" cellpadding="2" cellspacing="2"}%
-%EDITTABLE{ header="|*Repository*|*from Revision*|" format="| text, 50 | text, 25 |" changerows="on" }%
-|*Repository*|*merged revisions*|
-| kalypsobase | -48161 |
-| kalypso | -21530 |