diff options
author | Christian W. Damus | 2014-04-22 16:33:40 +0000 |
---|---|---|
committer | Christian W. Damus | 2014-04-22 16:33:40 +0000 |
commit | ebde630de0593d0278d5ab36bfc024b3d9dc0737 (patch) | |
tree | f2db080acfd99c5ea71331b80726672a4da0702f /plugins/views/org.eclipse.papyrus.views.search | |
parent | 1021d79f1ef9e27245464e445d795b8d336b57d4 (diff) | |
parent | cd03d0c5e3808d3831f70679ff3c17a67c4b2873 (diff) | |
download | org.eclipse.papyrus-ebde630de0593d0278d5ab36bfc024b3d9dc0737.tar.gz org.eclipse.papyrus-ebde630de0593d0278d5ab36bfc024b3d9dc0737.tar.xz org.eclipse.papyrus-ebde630de0593d0278d5ab36bfc024b3d9dc0737.zip |
Merge branch 'refs/heads/master' into bugs/431953-stereo-repair2
Conflicts:
plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/internal/participants/StereotypeApplicationRepairParticipant.java
Diffstat (limited to 'plugins/views/org.eclipse.papyrus.views.search')
-rw-r--r-- | plugins/views/org.eclipse.papyrus.views.search/pom.xml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/plugins/views/org.eclipse.papyrus.views.search/pom.xml b/plugins/views/org.eclipse.papyrus.views.search/pom.xml new file mode 100644 index 00000000000..206f93f7c3f --- /dev/null +++ b/plugins/views/org.eclipse.papyrus.views.search/pom.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>org.eclipse.papyrus</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../releng/top-pom-main.xml</relativePath> + </parent> + <artifactId>org.eclipse.papyrus.views.search</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>
\ No newline at end of file |