Skip to content

Commit

Permalink
Merge branch 'master' of github.com:jonase/eastwood
Browse files Browse the repository at this point in the history
  • Loading branch information
jonase committed Sep 1, 2012
2 parents d09663e + da440b8 commit b952d0a
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/leiningen/eastwood.clj
Expand Up @@ -9,6 +9,9 @@
opts (assoc opts :source-paths (or (:source-paths opts) opts (assoc opts :source-paths (or (:source-paths opts)
(:source-paths project) (:source-paths project)
[(:source-path project)])) [(:source-path project)]))
opts (assoc opts :java-source-paths (or (:java-source-paths opts)
(:java-source-paths project)
[(:java-source-path project)]))
global-opts (:eastwood project) global-opts (:eastwood project)
opts (merge global-opts opts)] opts (merge global-opts opts)]
(eval-in-project (add-if-missing project '[jonase/eastwood "0.0.3"]) (eval-in-project (add-if-missing project '[jonase/eastwood "0.0.3"])
Expand Down

0 comments on commit b952d0a

Please sign in to comment.