Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2014-03-07 16:45:19 +0000
committerCamille Letavernier2014-03-07 16:45:19 +0000
commit2029d305ac0457f9de0c79eeadf5865bc90d1e89 (patch)
tree332e2dc303c507d6a50c7537483c89c5e36a3ee2 /plugins/customization/org.eclipse.papyrus.customization.properties.generation
parent2e78449cd38c9307bd45e114fcb8bd28b98f8dd2 (diff)
parent8812639e3fcf949d67e43f9a53182ff241c329a5 (diff)
downloadorg.eclipse.papyrus-2029d305ac0457f9de0c79eeadf5865bc90d1e89.tar.gz
org.eclipse.papyrus-2029d305ac0457f9de0c79eeadf5865bc90d1e89.tar.xz
org.eclipse.papyrus-2029d305ac0457f9de0c79eeadf5865bc90d1e89.zip
Merge remote-tracking branch 'eclipse/master' into 386118-emf-facet
Conflicts: plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.querySet plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/TableLabelProvider.java plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorLookForEditorShell.java plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SysMLDefaultExplorerCustomization.uiCustom plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SysMLDefaultExplorerQueries.querySet plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/PapyrusBrowserQuery.querySet plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/PapyrusUMLFacet.facetSet plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/SimpleUML.uiCustom plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/UMLPapyrusDefaultBrowserCustomization.uiCustom
Diffstat (limited to 'plugins/customization/org.eclipse.papyrus.customization.properties.generation')
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.properties.generation/transforms/profile2datacontext.qvto2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/transforms/profile2datacontext.qvto b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/transforms/profile2datacontext.qvto
index 87fc19a10b3..6081fe4be4e 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/transforms/profile2datacontext.qvto
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/transforms/profile2datacontext.qvto
@@ -1,4 +1,4 @@
-modeltype UML uses "http://www.eclipse.org/uml2/4.0.0/UML";
+modeltype UML uses "http://www.eclipse.org/uml2/5.0.0/UML";
modeltype PropertyContext uses "http://www.eclipse.org/papyrus/properties/contexts/0.9";
modeltype PropertyEnvironment uses "http://www.eclipse.org/papyrus/properties/environment/0.9";
modeltype PRoot uses "http://www.eclipse.org/papyrus/properties/root";

Back to the top