Merge branch 'master' of git@github.com:EricThorsen/enclojure

Conflicts: src/plugins/netbeans/enclojure.plugin.netbeans/src/org/enclojure/ide/nb/editor/ClojureProjectTemplate.zip src/repl-client/src/org/enclojure/ide/repl/repl_panel.clj
ericthorsen · Oct 29, 2009 · 9153ddf · 9153ddf
2 parents 001342d + da310a2
commit 9153ddf
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/src/plugins/netbeans/enclojure.plugin.netbeans/nbproject/project.xml b/src/plugins/netbeans/enclojure.plugin.netbeans/nbproject/project.xml
@@ -507,12 +507,10 @@
                 <runtime-relative-path>ext/slf4j-jdk14-1.5.8.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/slf4j-jdk14-1.5.8.jar</binary-origin>
             </class-path-extension>
-            <!--
             <class-path-extension>
                 <runtime-relative-path>ext/tools.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/tools.jar</binary-origin>
             </class-path-extension>
-            -->
         </data>
     </configuration>
 </project>