MergeState kalypso 12.11
Merge state of branch kalypso_12.11
---++ 26.04.2013 nach trunk (Gernot Belger)
%TABLE{ tableborder="1" cellpadding="2" cellspacing="2"}% %EDITTABLE{ header="|*Repository*|*from Revision*|" format="| text, 50 | text, 25 |" changerows="on" }% |*Repository*|*merged revisions*| | kalypsobase | 47746-47794 | | kalypso | 21202-21278 | | k-reporting | nix | | planerclient | 2601-2604 |
---++ 29.05.2013 nach trunk (Gernot Belger)
%TABLE{ tableborder="1" cellpadding="2" cellspacing="2"}% %EDITTABLE{ header="|*Repository*|*from Revision*|" format="| text, 50 | text, 25 |" changerows="on" }% |*Repository*|*merged revisions*| | kalypsobase | 47794-48005 | | kalypso | 21278-21446 | | k-reporting | nix | | planerclient | 2604-2610 |
---++ 07.07.2013 nach trunk (Gernot Belger)
%TABLE{ tableborder="1" cellpadding="2" cellspacing="2"}% %EDITTABLE{ header="|*Repository*|*from Revision*|" format="| text, 50 | text, 25 |" changerows="on" }% |*Repository*|*merged revisions*| | kalypsobase | 48005-48180 | | kalypso | 21446-21536 | | k-reporting | nix | | planerclient | 2610-2622 |
| Merge | Target | Merger | Repository | Merged Revisions | ||||
|---|---|---|---|---|---|---|---|---|
| 26.03.2013 | trunk | Gernot Belger | kalypsobase | - 47735 | ||||
| kalypso | - 21182 | |||||||
| planerclient | - 2601 | |||||||
| 08.04.2013 | trunk | Stefan Kurzbach | kalypsobase | 47735 - 47746 | ||||
| kalypso | 21182 - 21202 | |||||||
| k-reporting | nix | |||||||
| planerclient | nix | |||||||
| trunk | Gernot Belger | kalypsobase | ||||||
|
|
trunk | Gernot Belger | kalypsobase | |||||
|
|
trunk | Gernot Belger | kalypsobase | |||||
| trunk | Gernot Belger | kalypsobase | ||||||
| 27.07.2013 | trunk | Stefan Kurzbach | kalypsobase | 48180-48292 | ||||
| kalypso | 21536-21586 | |||||||
| k-reporting | nix | |||||||
| planerclient | 2622-2628 | |||||||
| 15.09.2013 | trunk | Gernot Belger | kalypsobase | 48292-48450 | ||||
| kalypso | 21586- | |||||||
| k-reporting | nix | |||||||
| planerclient | 2628- |
