diff options
| author | Tom Schindl | 2016-03-16 14:21:42 +0000 |
|---|---|---|
| committer | Tom Schindl | 2016-03-16 14:21:42 +0000 |
| commit | c012411794c3f0ae66df270d4f9b7affb895a3ad (patch) | |
| tree | 56386c8134312736edfb6ac5769f0f89fc2acffc /releng/maven-deploy/platform/di_annotation.xml | |
| parent | 63f338ab515119116616568c317c80a15dd72b48 (diff) | |
| parent | aa71c74f50697dada863b88cdbb5debd9f3334b1 (diff) | |
| download | org.eclipse.efxclipse-c012411794c3f0ae66df270d4f9b7affb895a3ad.tar.gz org.eclipse.efxclipse-c012411794c3f0ae66df270d4f9b7affb895a3ad.tar.xz org.eclipse.efxclipse-c012411794c3f0ae66df270d4f9b7affb895a3ad.zip | |
Merge branch 'master' of ssh://tschindl@git.eclipse.org:29418/efxclipse/org.eclipse.efxclipse
Conflicts:
bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/StyledTextArea.java
Diffstat (limited to 'releng/maven-deploy/platform/di_annotation.xml')
| -rw-r--r-- | releng/maven-deploy/platform/di_annotation.xml | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/releng/maven-deploy/platform/di_annotation.xml b/releng/maven-deploy/platform/di_annotation.xml deleted file mode 100644 index 68ff1c89e..000000000 --- a/releng/maven-deploy/platform/di_annotation.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <groupId>at.bestsolution.eclipse</groupId> - <artifactId>org.eclipse.e4.core.di.annotations</artifactId> - <version>1.4.0</version> - <name>Some basic Equinox components</name> - <description>Some basic Equinox components useable outside of OSGi</description> - <url>https://www.eclipse.org/equinox/</url> - <licenses> - <license> - <name>Eclipse Public License - v 1.0</name> - <url>http://www.eclipse.org/legal/epl-v10.html</url> - </license> - </licenses> - <scm> - <url>http://git.eclipse.org/c/equinox/rt.equinox.bundles.git/tree/bundles/org.eclipse.equinox.common</url> - </scm> - <developers> - <developer> - <name>Tom Schindl</name> - <organization>Eclipse.org</organization> - <roles> - <role>contributor</role> - </roles> - </developer> - </developers> - -</project>
\ No newline at end of file |