Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Alexander Kuppe2010-10-29 11:20:37 -0400
committerMarkus Alexander Kuppe2010-10-29 11:20:37 -0400
commit229f46f1dae33a78c63a52f9a80a12567643bd2e (patch)
tree9aaa70f700bae5ee2a5bcfb089fdf29f951f1211
parentd66bf6e6d1466d3d6f015186da889a9cea2ca36c (diff)
parent1a04e1b3d0365d7cbffd52e0e52e18596b6d8440 (diff)
downloadorg.eclipse.ecf-229f46f1dae33a78c63a52f9a80a12567643bd2e.tar.gz
org.eclipse.ecf-229f46f1dae33a78c63a52f9a80a12567643bd2e.tar.xz
org.eclipse.ecf-229f46f1dae33a78c63a52f9a80a12567643bd2e.zip
Merge branch 'master' of ssh://git.eclipse.org/gitroot/ecf/org.eclipse.ecf
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/Messages.java2
-rw-r--r--releng/features/org.eclipse.ecf.core.featurepatch/feature.properties2
-rw-r--r--releng/features/org.eclipse.ecf.core.featurepatch/feature.xml2
-rw-r--r--releng/features/org.eclipse.ecf.sdk/feature.xml2
4 files changed, 3 insertions, 5 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/Messages.java b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/Messages.java
index 9bc75293d..f07ffcc9f 100644
--- a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/Messages.java
+++ b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/Messages.java
@@ -9,8 +9,6 @@ public class Messages extends NLS {
public static String DnsSdDiscoveryContainerAdapter_Comparator_SRV_Records;
public static String DnsSdDiscoveryContainerAdapter_No_IDiscovery_Advertiser;
public static String DnsSdDiscoveryContainerAdapter_No_IDiscovery_Locator;
- public static String DnsSdDiscoveryException_1;
- public static String DnsSdDiscoveryException_3;
public static String DnsSdDiscoveryException_DynDns_Update_Denied;
public static String DnsSdDiscoveryException_DynDNS_Updated_Failed;
public static String DnsSdDiscoveryException_TSIG_Verify_Failed;
diff --git a/releng/features/org.eclipse.ecf.core.featurepatch/feature.properties b/releng/features/org.eclipse.ecf.core.featurepatch/feature.properties
index b11ae724c..6e51da1ee 100644
--- a/releng/features/org.eclipse.ecf.core.featurepatch/feature.properties
+++ b/releng/features/org.eclipse.ecf.core.featurepatch/feature.properties
@@ -6,7 +6,7 @@
# http://www.eclipse.org/legal/epl-v10.html
#
############################################################################
-featureName=ECF 3.2 Patch for Eclipse 3.5.X
+featureName=ECF 3.2 Patch for Eclipse 3.5.X and 3.6.x
providerName=Eclipse.org - ECF
# "licenseURL" property - URL of the "Feature License"
diff --git a/releng/features/org.eclipse.ecf.core.featurepatch/feature.xml b/releng/features/org.eclipse.ecf.core.featurepatch/feature.xml
index 0bfe0b941..af558c0a7 100644
--- a/releng/features/org.eclipse.ecf.core.featurepatch/feature.xml
+++ b/releng/features/org.eclipse.ecf.core.featurepatch/feature.xml
@@ -6,7 +6,7 @@
provider-name="%providerName">
<description url="http://www.eclipse.org/ecf">
- This feature provides a patch of Eclipse 3.5-3.6 ECF Core Bundles. This allows the ECF 3.3 Target Components to function properly.
+ This feature provides a patch of Eclipse 3.5-3.6 ECF Core Bundles. This allows the ECF 3.4 Target Components to function properly.
</description>
<copyright>
diff --git a/releng/features/org.eclipse.ecf.sdk/feature.xml b/releng/features/org.eclipse.ecf.sdk/feature.xml
index c3e332554..3526647f5 100644
--- a/releng/features/org.eclipse.ecf.sdk/feature.xml
+++ b/releng/features/org.eclipse.ecf.sdk/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.sdk"
label="ECF Target Components Feature"
- version="3.3.0.qualifier"
+ version="3.4.0.qualifier"
provider-name="Eclipse.org">
<description url="http://www.eclipse.org/ecf">

Back to the top