Permalink
Browse files

Merge branch 'refs/heads/0.11.0'

Conflicts:
	ccw.branding/META-INF/MANIFEST.MF
	ccw.core/META-INF/MANIFEST.MF
	ccw.feature/feature.xml
	ccw.leiningen.branding/META-INF/MANIFEST.MF
	ccw.leiningen.feature/feature.xml
	ccw.leiningen/META-INF/MANIFEST.MF
	ccw.util/META-INF/MANIFEST.MF
  • Loading branch information...
2 parents d2ac1d5 + 7fdf127 commit 0aa993b97b940316c363aae476edb910c29444c1 @laurentpetit laurentpetit committed Jan 10, 2013
Showing with 18 additions and 11 deletions.
  1. +12 −7 ccw.feature/feature.xml
  2. +6 −4 ccw.leiningen.feature/feature.xml
View
@@ -46,13 +46,6 @@
<import plugin="org.eclipse.core.expressions"/>
<import plugin="org.eclipse.ui.forms"/>
<import plugin="org.eclipse.ui.workbench.texteditor"/>
- <import plugin="ccw.clojure" version="1.3.0" match="greaterOrEqual"/>
- <import plugin="clojure.osgi" version="1.3.0" match="greaterOrEqual"/>
- <import plugin="org.clojure.tools.nrepl" version="0.2.0" match="greaterOrEqual"/>
- <import plugin="ccw.org.clojure.core.incubator" version="0.1.0" match="greaterOrEqual"/>
- <import plugin="ccw.util"/>
- <import plugin="net.cgrand.parsley" version="0.0.12" match="greaterOrEqual"/>
- <import plugin="net.cgrand.regex" version="0.0.4" match="greaterOrEqual"/>
<import plugin="org.eclipse.osgi"/>
</requires>
@@ -120,4 +113,16 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="ccw.clojurecontrib"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="ccw.util"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
</feature>
@@ -28,14 +28,10 @@
<import plugin="org.eclipse.jdt.core"/>
<import plugin="org.eclipse.jdt.ui"/>
<import plugin="org.eclipse.jface"/>
- <import plugin="ccw.clojure" version="1.3.0" match="greaterOrEqual"/>
- <import plugin="clojure.osgi" version="1.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui"/>
- <import plugin="ccw.leiningen-core" version="0.16.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jface.text" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.expressions"/>
<import plugin="org.eclipse.jdt.launching" match="greaterOrEqual"/>
- <import plugin="ccw.org.clojure.core.incubator" version="0.1.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.platform"/>
<import plugin="org.eclipse.ui.ide"/>
<import plugin="org.eclipse.jdt.debug.ui"/>
@@ -92,4 +88,10 @@
install-size="0"
version="0.0.0"/>
+ <plugin
+ id="ccw.clojurecontrib"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
</feature>

0 comments on commit 0aa993b

Please sign in to comment.