aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2014-05-29 15:48:20 +0200
committerLoïc Hoguin <[email protected]>2014-05-29 15:48:20 +0200
commit19893c5c7e7068385f01c530255282ff78aac65a (patch)
treef9a0e87823bd92214617c30be94dbeaf5f0c052f
parentc042a2c8fcd7e773bc4ee1340668e3b421b4477a (diff)
parentd9dc5ed28d470bd363967e8d353e0c7b746a6a93 (diff)
downloaderlang.mk-19893c5c7e7068385f01c530255282ff78aac65a.tar.gz
erlang.mk-19893c5c7e7068385f01c530255282ff78aac65a.tar.bz2
erlang.mk-19893c5c7e7068385f01c530255282ff78aac65a.zip
Merge branch 'master' of git://github.com/kiela/erlang.mk
-rw-r--r--erlang.mk2
-rw-r--r--plugins/relx.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/erlang.mk b/erlang.mk
index 53ef507..9e23be7 100644
--- a/erlang.mk
+++ b/erlang.mk
@@ -58,7 +58,7 @@ ifneq ($(wildcard $(RELX_CONFIG)),)
RELX ?= $(CURDIR)/relx
export RELX
-RELX_URL ?= https://github.com/erlware/relx/releases/download/v0.6.0/relx
+RELX_URL ?= https://github.com/erlware/relx/releases/download/v1.0.2/relx
RELX_OPTS ?=
RELX_OUTPUT_DIR ?= _rel
diff --git a/plugins/relx.mk b/plugins/relx.mk
index 5213318..c6fd227 100644
--- a/plugins/relx.mk
+++ b/plugins/relx.mk
@@ -12,7 +12,7 @@ ifneq ($(wildcard $(RELX_CONFIG)),)
RELX ?= $(CURDIR)/relx
export RELX
-RELX_URL ?= https://github.com/erlware/relx/releases/download/v0.6.0/relx
+RELX_URL ?= https://github.com/erlware/relx/releases/download/v1.0.2/relx
RELX_OPTS ?=
RELX_OUTPUT_DIR ?= _rel