| commit | 70acd45029f8ca5698926a47f84aaf4b806fa9cc | [log] [tgz] |
|---|---|---|
| author | Kenn Hussey <Kenn.Hussey@gmail.com> | Sun Oct 20 22:06:46 2013 -0400 |
| committer | Kenn Hussey <Kenn.Hussey@gmail.com> | Sun Oct 20 22:06:46 2013 -0400 |
| tree | 94c59c66fe238b0d9010a53f8a81f51dcde60907 | |
| parent | 1893323eabbd0437e4d6cc1245491b4bc2b3bb0d [diff] | |
| parent | 96a34d2a1bddb2198c3c99d840f64d1ed1f8c670 [diff] |
Merge branch 'master' into bugs/401682 Conflicts: tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/bug/tests/UMLBugTests.java