| commit | 19a528824440b620fd40a33a467dd3e8ba19138a | [log] [tgz] |
|---|---|---|
| author | Christian W. Damus <give.a.damus@gmail.com> | Thu Jan 09 17:53:41 2014 -0500 |
| committer | Christian W. Damus <give.a.damus@gmail.com> | Thu Jan 09 17:53:41 2014 -0500 |
| tree | 6dbfe35eb8ce45a6b67f584619cc672458f426a6 | |
| parent | 6d575502ef9a9c01c6c6e4f9837cb1ff8a8111de [diff] | |
| parent | 1858d8ad3947ede5225eb1de81a06763d7970b68 [diff] |
Merge branch 'refs/heads/master' into bugs/420338 Conflicts: plugins/org.eclipse.uml2.uml.ecore.exporter/META-INF/MANIFEST.MF