| commit | c7ab97f046f69b2a05c62b0fe989db02c91abe13 | [log] [tgz] |
|---|---|---|
| author | Kenn Hussey <Kenn.Hussey@gmail.com> | Sun Oct 20 22:30:45 2013 -0400 |
| committer | Kenn Hussey <Kenn.Hussey@gmail.com> | Sun Oct 20 22:30:45 2013 -0400 |
| tree | bcab28ec357b44979aaba57be0b047e81a5861ae | |
| parent | a48f5793f70a51b24a1a45f7e988e5847d7424e1 [diff] | |
| parent | 70acd45029f8ca5698926a47f84aaf4b806fa9cc [diff] |
Merge branch 'master' into bugs/409396 Conflicts: plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/bug/tests/UMLBugTests.java