diff options
| author | Mickael ADAM | 2014-09-30 07:25:10 +0000 |
|---|---|---|
| committer | Mickael ADAM | 2014-09-30 13:20:41 +0000 |
| commit | 54361511a2bdfcc89c44e5cec0e8920217f62797 (patch) | |
| tree | 3abeb25f7b0689031d7c9a9f08ea9337173ac4e3 /plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/pom.xml | |
| parent | 377cc40520d3a41d022d78c6a54afe25b5b6d213 (diff) | |
| parent | 23e8fac0e97cd5baa45424b9a7a0b0c646081c75 (diff) | |
| download | org.eclipse.papyrus-54361511a2bdfcc89c44e5cec0e8920217f62797.tar.gz org.eclipse.papyrus-54361511a2bdfcc89c44e5cec0e8920217f62797.tar.xz org.eclipse.papyrus-54361511a2bdfcc89c44e5cec0e8920217f62797.zip | |
Merge remote-tracking branch 'origin/master' into master2
Conflicts:
plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
Change-Id: Ied01d9c181e70008eeb92a4d58f0f244e08f1981
Signed-off-by: Mickael ADAM <mickael.adam@ALL4TEC.net>
Diffstat (limited to 'plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/pom.xml')
| -rw-r--r-- | plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/pom.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/pom.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/pom.xml index 7b150c6664d..5efc3a80405 100644 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/pom.xml +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.iso42010/pom.xml @@ -4,11 +4,11 @@ <parent> <artifactId>org.eclipse.papyrus</artifactId> <groupId>org.eclipse.papyrus</groupId> - <version>1.0.1-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <relativePath>../../../../releng/top-pom-main.xml</relativePath> </parent> <artifactId>org.eclipse.papyrus.infra.viewpoints.iso42010</artifactId> <groupId>org.eclipse.papyrus</groupId> - <version>1.0.1-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file |