Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2018-09-07 15:36:40 +0000
committerOlivier Constant2018-10-03 08:38:38 +0000
commit777560051c3b922787aae661dd390092be4e2f38 (patch)
tree988c6f44b08d0fc3b12ddb353d9e3bf1c3e5e693 /tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/ClockRadio.melodymodeller
parent17084c20f7195e9a2c760b6f61956a04ce80198b (diff)
downloadorg.eclipse.emf.diffmerge.patch-777560051c3b922787aae661dd390092be4e2f38.tar.gz
org.eclipse.emf.diffmerge.patch-777560051c3b922787aae661dd390092be4e2f38.tar.xz
org.eclipse.emf.diffmerge.patch-777560051c3b922787aae661dd390092be4e2f38.zip
Bug 538800 - Upgrade version to 0.11.0v0.11.0
- diffmerge.patch: copyrights only, following license change Change-Id: I7eb5d5c41d80ea6d57b0dea1a752f6d1723704f5 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
Diffstat (limited to 'tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/ClockRadio.melodymodeller')
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/ClockRadio.melodymodeller4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/ClockRadio.melodymodeller b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/ClockRadio.melodymodeller
index 67f021a..5612899 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/ClockRadio.melodymodeller
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/ClockRadio.melodymodeller
@@ -1051,7 +1051,7 @@
id="5826e8ae-6abb-44ff-8b2a-c5075fbb46ad" targetElement="#72da48fd-a612-4a5d-94ea-9761766be7a6"
sourceElement="#e28f24ea-c6f0-4fa6-ae8e-080e5fa52fc3"/>
<ownedFunctionalExchanges xsi:type="org.polarsys.capella.core.data.fa:FunctionalExchange"
- id="7e183eb2-89b3-49bc-9414-201792e5971f" name="new current time"
+ id="7e183eb2-89b3-49bc-9414-201892e5971f" name="new current time"
target="#64270f20-0db3-46b2-9627-9774c9167f70" source="#668aae30-0c45-49cf-ba27-6cd3943877b1"/>
</ownedFunctions>
<ownedFunctions xsi:type="org.polarsys.capella.core.data.la:LogicalFunction"
@@ -2109,7 +2109,7 @@
id="7dcdf8ea-cf11-4709-a682-f0db549ce99c" name="Clock HMI" source="#8ce9d84a-c8d4-4b75-b00c-b3b2e857f109"
target="#fcb423f6-0fdf-47f8-843d-6da0ad81ec81" kind="FLOW">
<ownedComponentExchangeFunctionalExchangeAllocations xsi:type="org.polarsys.capella.core.data.fa:ComponentExchangeFunctionalExchangeAllocation"
- id="fdf4475f-f537-4bb9-bc80-94445cefceb4" targetElement="#7e183eb2-89b3-49bc-9414-201792e5971f"
+ id="fdf4475f-f537-4bb9-bc80-94445cefceb4" targetElement="#7e183eb2-89b3-49bc-9414-201892e5971f"
sourceElement="#7dcdf8ea-cf11-4709-a682-f0db549ce99c"/>
</ownedComponentExchanges>
<ownedComponentExchanges xsi:type="org.polarsys.capella.core.data.fa:ComponentExchange"

Back to the top