Merge remote branch 'origin/master' into work/rational-rose-import
Conflicts:
umbrello/petaltree2uml.cpp
@Ralf: Many duplicated objects are being created in the list view.
I have not yet solved this problem. Have you seen it too?
Description
Description
Details
Details
- Committed
okellogg May 15 2014, 3:24 AM - Parents
- R139:d045132bbf5e: Add qDebug indenter for petal import, which eases import debugging.
R139:0dd86bb22c99: Fix Krazy issue. - Branches
- Unknown
- Tags
- References
- refs/backups/branch-work/rational-rose-import-1400497303
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 0dd86bb22c99 | habacker | Fix Krazy issue. | May 13 2014 | |||
| 0a79db1b9e99 | Oliver Kellogg | Merge branch 'master' of git://anongit.kde.org/umbrello | May 13 2014 | |||
| 12615a59a115 | Oliver Kellogg | Continuation of support for Rose import of controlled units: | May 13 2014 | |||
| 45700601be5a | habacker | Fix Krazy issue. | May 13 2014 | |||
| a113a1be49ef | Oliver Kellogg | (In reply to comment #11) > handleControlledUnit(): New. To be fleshed out Real… | May 13 2014 |