Difference between revisions of "MergeState kalypso 12.11"
From KalypsoDev
Gernotbelger (Talk | contribs) |
Gernotbelger (Talk | contribs) |
||
| Line 1: | Line 1: | ||
= Merge state of branch kalypso_12.11 = | = Merge state of branch kalypso_12.11 = | ||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
{| class="wikitable" | {| class="wikitable" | ||
| Line 53: | Line 19: | ||
| || || || planerclient || nix | | || || || planerclient || nix | ||
|- | |- | ||
| − | + | | 26.04.2013 || trunk || Gernot Belger || kalypsobase || 47746-47794 | |
| − | | || trunk || Gernot Belger || kalypsobase || | + | |
|- | |- | ||
| − | | || || || | + | | || || || kalypso || 21202-21278 |
|- | |- | ||
| − | | || || || | + | | || || || k-reporting || nix |
|- | |- | ||
| − | | || || || | + | | || || || planerclient || 2601-2604 |
| − | + | ||
| − | + | ||
| − | + | ||
|- | |- | ||
| − | | || || || | + | | 29.05.2013 || trunk || Gernot Belger || kalypsobase || 47794-48005 |
|- | |- | ||
| − | | || || || | + | | || || || kalypso || 21278-21446 |
|- | |- | ||
| − | | || || || | + | | || || || k-reporting || nix |
| − | + | ||
| − | + | ||
| − | + | ||
|- | |- | ||
| − | | || || || | + | | || || || planerclient || 2604-2610 |
| + | |- | ||
| + | | 07.07.2013 || trunk || Gernot Belger || kalypsobase || 48005-48180 | ||
|- | |- | ||
| − | | || || || | + | | || || || kalypso || 21446-21536 |
|- | |- | ||
| − | | || || || | + | | || || || k-reporting || nix |
| − | + | ||
| − | + | ||
| − | + | ||
|- | |- | ||
| − | | || || || | + | | || || || planerclient || 2610-2622 |
| − | | | + | |
| − | + | ||
| − | |- | + | |
| − | + | ||
|- | |- | ||
| 27.07.2013 || trunk || Stefan Kurzbach || kalypsobase || 48180-48292 | | 27.07.2013 || trunk || Stefan Kurzbach || kalypsobase || 48180-48292 | ||
| Line 99: | Line 53: | ||
| 15.09.2013 || trunk || Gernot Belger || kalypsobase || 48292-48450 | | 15.09.2013 || trunk || Gernot Belger || kalypsobase || 48292-48450 | ||
|- | |- | ||
| − | | || || || kalypso || 21586- | + | | || || || kalypso || 21586-21680 |
|- | |- | ||
| || || || k-reporting || nix | | || || || k-reporting || nix | ||
|- | |- | ||
| || || || planerclient || 2628- | | || || || planerclient || 2628- | ||
| + | |- | ||
| + | | || trunk || Gernot Belger || kalypsobase || | ||
| + | |- | ||
| + | | || || || kalypso || | ||
| + | |- | ||
| + | | || || || k-reporting || | ||
| + | |- | ||
| + | | || || || planerclient || | ||
| + | |- | ||
|} | |} | ||
Revision as of 11:09, 15 September 2013
Merge state of branch kalypso_12.11
| 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 | |||
| 26.04.2013 | trunk | Gernot Belger | kalypsobase | 47746-47794 |
| kalypso | 21202-21278 | |||
| k-reporting | nix | |||
| planerclient | 2601-2604 | |||
| 29.05.2013 | trunk | Gernot Belger | kalypsobase | 47794-48005 |
| kalypso | 21278-21446 | |||
| k-reporting | nix | |||
| planerclient | 2604-2610 | |||
| 07.07.2013 | trunk | Gernot Belger | kalypsobase | 48005-48180 |
| kalypso | 21446-21536 | |||
| k-reporting | nix | |||
| planerclient | 2610-2622 | |||
| 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-21680 | |||
| k-reporting | nix | |||
| planerclient | 2628- | |||
| trunk | Gernot Belger | kalypsobase | ||
| kalypso | ||||
| k-reporting | ||||
| planerclient |
