diff options
author | khussey | 2006-10-18 18:30:19 +0000 |
---|---|---|
committer | khussey | 2006-10-18 18:30:19 +0000 |
commit | 4f81e8e3b95c2c773e3406bbbb305721ca387b55 (patch) | |
tree | 09db5973aadee2e503baafe2915eadccc6562b9a /plugins/org.eclipse.uml2.uml/model/UML.uml | |
parent | d9958f79b923c9c21b048b706fddc5678c52d301 (diff) | |
download | org.eclipse.uml2.test-4f81e8e3b95c2c773e3406bbbb305721ca387b55.tar.gz org.eclipse.uml2.test-4f81e8e3b95c2c773e3406bbbb305721ca387b55.tar.xz org.eclipse.uml2.test-4f81e8e3b95c2c773e3406bbbb305721ca387b55.zip |
[161119] Merging changes from maintenance stream.
Diffstat (limited to 'plugins/org.eclipse.uml2.uml/model/UML.uml')
-rw-r--r-- | plugins/org.eclipse.uml2.uml/model/UML.uml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/plugins/org.eclipse.uml2.uml/model/UML.uml b/plugins/org.eclipse.uml2.uml/model/UML.uml index 5d663434..75e7e396 100644 --- a/plugins/org.eclipse.uml2.uml/model/UML.uml +++ b/plugins/org.eclipse.uml2.uml/model/UML.uml @@ -1394,12 +1394,12 @@ <appliedProfile href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/> </profileApplication> </uml:Model> - <Ecore:EPackage xmi:id="_YtGBofZoEdqhaqw0kkQfPQ" base_Package="_o8I_sGvaEdq4DLWZOhbdEA" packageName="uml" nsPrefix="uml" nsURI="http://www.eclipse.org/uml2/2.0.0/UML" basePackage="org.eclipse.uml2" prefix="UML"/> - <Ecore:EAttribute xmi:id="_Z5ewEC7uEduf17E0MwaY9g" isUnsettable="true" xmlFeatureKind="Element" base_Property="_EOZfkC4xEduBJv9HKGdiyg"/> - <Ecore:EDataType xmi:id="_YtitkPZoEdqhaqw0kkQfPQ" instanceClassName="boolean" base_PrimitiveType="_UdivYGvsEdqG6fBIPwe-mw"/> - <Ecore:EDataType xmi:id="_YtitkfZoEdqhaqw0kkQfPQ" instanceClassName="int" base_PrimitiveType="_XqvEIGvsEdqG6fBIPwe-mw"/> - <Ecore:EDataType xmi:id="_YtitkvZoEdqhaqw0kkQfPQ" instanceClassName="java.lang.String" base_PrimitiveType="_aAyVgGvsEdqG6fBIPwe-mw"/> - <Ecore:EDataType xmi:id="_Ytitk_ZoEdqhaqw0kkQfPQ" instanceClassName="int" base_PrimitiveType="_dRZxsGvsEdqG6fBIPwe-mw"/> - <Ecore:EAttribute xmi:id="_Z57cAS7uEduf17E0MwaY9g" isUnsettable="true" xmlFeatureKind="Element" base_Property="_c_GaAC7qEdutFcse1QllAQ"/> - <Ecore:EAttribute xmi:id="_Z57cAi7uEduf17E0MwaY9g" isUnsettable="true" xmlFeatureKind="Element" base_Property="_ldWYsS7qEdutFcse1QllAQ"/> + <Ecore:EPackage xmi:id="_tYLfUFouEduqL61CEsqW6g" base_Package="_o8I_sGvaEdq4DLWZOhbdEA" packageName="uml" nsPrefix="uml" nsURI="http://www.eclipse.org/uml2/2.0.0/UML" basePackage="org.eclipse.uml2" prefix="UML"/> + <Ecore:EAttribute xmi:id="_tYLfUVouEduqL61CEsqW6g" isUnsettable="true" xmlFeatureKind="Element" base_Property="_EOZfkC4xEduBJv9HKGdiyg"/> + <Ecore:EDataType xmi:id="_tYUpQFouEduqL61CEsqW6g" instanceClassName="boolean" base_PrimitiveType="_UdivYGvsEdqG6fBIPwe-mw"/> + <Ecore:EDataType xmi:id="_tYUpQVouEduqL61CEsqW6g" instanceClassName="int" base_PrimitiveType="_XqvEIGvsEdqG6fBIPwe-mw"/> + <Ecore:EDataType xmi:id="_tYUpQlouEduqL61CEsqW6g" instanceClassName="java.lang.String" base_PrimitiveType="_aAyVgGvsEdqG6fBIPwe-mw"/> + <Ecore:EDataType xmi:id="_tYUpQ1ouEduqL61CEsqW6g" instanceClassName="int" base_PrimitiveType="_dRZxsGvsEdqG6fBIPwe-mw"/> + <Ecore:EAttribute xmi:id="_tYeaQFouEduqL61CEsqW6g" isUnsettable="true" xmlFeatureKind="Element" base_Property="_c_GaAC7qEdutFcse1QllAQ"/> + <Ecore:EAttribute xmi:id="_tYeaQVouEduqL61CEsqW6g" isUnsettable="true" xmlFeatureKind="Element" base_Property="_ldWYsS7qEdutFcse1QllAQ"/> </xmi:XMI> |