<html>
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<div class="moz-cite-prefix">Am 27.09.2016 um 17:12 schrieb Ralf
Habacker:<br>
</div>
<blockquote cite="mid:57EA8C71.8030409@freenet.de" type="cite">
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
<div class="moz-cite-prefix">Am 24.09.2016 um 02:46 schrieb Lays
Rodrigues:<br>
</div>
<blockquote
cite="mid:CAOnPkwe7Hyqz0QEK6qn_9PeDefwWEoANYE7exXO7Ud5BXgmJ8A@mail.gmail.com"
type="cite">
<div dir="ltr"><br>
<div class="gmail_default" style="font-size:small">So I think
that depends a little on you reviewing my work and
highlighting points that I need to check. <br>
</div>
</div>
</blockquote>
I'm going to try to merge git master into frameworks, which will
give a detailed list of issues.<br>
</blockquote>
I did a quick check. There are several conflicts: <br>
<br>
<br>
1. The DocumentationWidget constructors has been diverged and
produces conflicts<br>
2. DocumentationWidget from master provides a CodeTextEditor tab,
which is not in frameworks.<br>
3. DocumentationWidget has new methods setUMLObject() required by ui
introduction<br>
4. UMLDatatypeWidget conflicts because of constructor refactoring
and introduction of new set... () methods <br>
5. In UMLAttributeDialog::apply() setStatic() is now supported only
for c++ language.<br>
6. Many conflicts caused by migration to Qt5 only signal/slot usage.<br>
<br>
<br>
<br>
<br>
</body>
</html>