Merge branch 'master' of ssh://goldsmith.journeyman.cc/srv/git/mw-parser

This commit is contained in:
Simon Brooke 2015-02-10 22:27:47 +00:00
commit 72c4f45553

View file

@ -11,7 +11,7 @@
:license {:name "GNU General Public License v2" :license {:name "GNU General Public License v2"
:url "http://www.gnu.org/licenses/gpl-2.0.html"} :url "http://www.gnu.org/licenses/gpl-2.0.html"}
:plugins [[lein-marginalia "0.7.1"]] :plugins [[lein-marginalia "0.7.1"]]
:dependencies [[org.clojure/clojure "1.5.1"] :dependencies [[org.clojure/clojure "1.6.0"]
[org.clojure/tools.trace "0.7.8"] [org.clojure/tools.trace "0.7.8"]
[instaparse "1.3.5"] [instaparse "1.3.5"]
[mw-engine "0.1.5-SNAPSHOT"] [mw-engine "0.1.5-SNAPSHOT"]