Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2012-05-15 00:48:09 -0400
committerslewis2012-05-15 00:48:09 -0400
commit4c08b1cdd1c37f2c30eec6dd7577cd1a18566bab (patch)
tree43c0e234988e1cefdbdee44c998142f6b1181599
parent053598380b819d36bb0d310ad7643cdac90de114 (diff)
parent20c20aead62ff1bd0d33bae2b98bdadc7c3e34f7 (diff)
downloadorg.eclipse.ecf-4c08b1cdd1c37f2c30eec6dd7577cd1a18566bab.tar.gz
org.eclipse.ecf-4c08b1cdd1c37f2c30eec6dd7577cd1a18566bab.tar.xz
org.eclipse.ecf-4c08b1cdd1c37f2c30eec6dd7577cd1a18566bab.zip
Merge remote-tracking branch 'origin/master'
-rw-r--r--releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/.project (renamed from org.eclipse.ecf.filetransfer.httpclient.feature/.project)0
-rw-r--r--releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/about.html (renamed from org.eclipse.ecf.filetransfer.httpclient.feature/about.html)0
-rw-r--r--releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/asl-v20.txt (renamed from org.eclipse.ecf.filetransfer.httpclient.feature/asl-v20.txt)0
-rw-r--r--releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/buckminster.cspex (renamed from org.eclipse.ecf.filetransfer.httpclient.feature/buckminster.cspex)0
-rw-r--r--releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/build.properties (renamed from org.eclipse.ecf.filetransfer.httpclient.feature/build.properties)0
-rw-r--r--releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/feature.properties (renamed from org.eclipse.ecf.filetransfer.httpclient.feature/feature.properties)0
-rw-r--r--releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/feature.xml (renamed from org.eclipse.ecf.filetransfer.httpclient.feature/feature.xml)7
-rw-r--r--releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/license.html (renamed from org.eclipse.ecf.filetransfer.httpclient.feature/license.html)0
-rw-r--r--releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/notice.html (renamed from org.eclipse.ecf.filetransfer.httpclient.feature/notice.html)0
-rw-r--r--releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/org.eclipse.ecf.filetransfer.httpclient.cquery (renamed from org.eclipse.ecf.filetransfer.httpclient.feature/org.eclipse.ecf.filetransfer.httpclient.cquery)0
-rw-r--r--releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/org.eclipse.ecf.filetransfer.httpclient.mspec (renamed from org.eclipse.ecf.filetransfer.httpclient.feature/org.eclipse.ecf.filetransfer.httpclient.mspec)0
11 files changed, 7 insertions, 0 deletions
diff --git a/org.eclipse.ecf.filetransfer.httpclient.feature/.project b/releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/.project
index 01c87a948..01c87a948 100644
--- a/org.eclipse.ecf.filetransfer.httpclient.feature/.project
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/.project
diff --git a/org.eclipse.ecf.filetransfer.httpclient.feature/about.html b/releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/about.html
index 103580625..103580625 100644
--- a/org.eclipse.ecf.filetransfer.httpclient.feature/about.html
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/about.html
diff --git a/org.eclipse.ecf.filetransfer.httpclient.feature/asl-v20.txt b/releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/asl-v20.txt
index d64569567..d64569567 100644
--- a/org.eclipse.ecf.filetransfer.httpclient.feature/asl-v20.txt
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/asl-v20.txt
diff --git a/org.eclipse.ecf.filetransfer.httpclient.feature/buckminster.cspex b/releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/buckminster.cspex
index 313bae603..313bae603 100644
--- a/org.eclipse.ecf.filetransfer.httpclient.feature/buckminster.cspex
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/buckminster.cspex
diff --git a/org.eclipse.ecf.filetransfer.httpclient.feature/build.properties b/releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/build.properties
index a0db80955..a0db80955 100644
--- a/org.eclipse.ecf.filetransfer.httpclient.feature/build.properties
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/build.properties
diff --git a/org.eclipse.ecf.filetransfer.httpclient.feature/feature.properties b/releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/feature.properties
index 1916cc2f1..1916cc2f1 100644
--- a/org.eclipse.ecf.filetransfer.httpclient.feature/feature.properties
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/feature.properties
diff --git a/org.eclipse.ecf.filetransfer.httpclient.feature/feature.xml b/releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/feature.xml
index 4883b554c..34bada858 100644
--- a/org.eclipse.ecf.filetransfer.httpclient.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/feature.xml
@@ -46,6 +46,13 @@ Contributors: Composent, Inc. - initial API and implementation
unpack="false"/>
<plugin
+ id="org.eclipse.ecf.ssl"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
id="org.eclipse.ecf.provider.filetransfer.httpclient"
download-size="0"
install-size="0"
diff --git a/org.eclipse.ecf.filetransfer.httpclient.feature/license.html b/releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/license.html
index c184ca36a..c184ca36a 100644
--- a/org.eclipse.ecf.filetransfer.httpclient.feature/license.html
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/license.html
diff --git a/org.eclipse.ecf.filetransfer.httpclient.feature/notice.html b/releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/notice.html
index 5ad00ba71..5ad00ba71 100644
--- a/org.eclipse.ecf.filetransfer.httpclient.feature/notice.html
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/notice.html
diff --git a/org.eclipse.ecf.filetransfer.httpclient.feature/org.eclipse.ecf.filetransfer.httpclient.cquery b/releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/org.eclipse.ecf.filetransfer.httpclient.cquery
index 550f13f21..550f13f21 100644
--- a/org.eclipse.ecf.filetransfer.httpclient.feature/org.eclipse.ecf.filetransfer.httpclient.cquery
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/org.eclipse.ecf.filetransfer.httpclient.cquery
diff --git a/org.eclipse.ecf.filetransfer.httpclient.feature/org.eclipse.ecf.filetransfer.httpclient.mspec b/releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/org.eclipse.ecf.filetransfer.httpclient.mspec
index fc18a9b6a..fc18a9b6a 100644
--- a/org.eclipse.ecf.filetransfer.httpclient.feature/org.eclipse.ecf.filetransfer.httpclient.mspec
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient.feature/org.eclipse.ecf.filetransfer.httpclient.mspec

Back to the top