aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2015-01-04 20:39:05 +0100
committerLoïc Hoguin <[email protected]>2015-01-04 20:39:05 +0100
commit366a0c9d770f8701131213bd4ad0edf579cacc87 (patch)
tree501595b0e3bc32db562a3d090ed2621b40d5be5c
parentd36a769e7c8639d8f3431fbc1848830c1aaf9650 (diff)
parent22a538441867ed7527803a34d3c6c81788bad925 (diff)
downloaderlang.mk-366a0c9d770f8701131213bd4ad0edf579cacc87.tar.gz
erlang.mk-366a0c9d770f8701131213bd4ad0edf579cacc87.tar.bz2
erlang.mk-366a0c9d770f8701131213bd4ad0edf579cacc87.zip
Merge branch 'update_relx_v1.1.0' of https://github.com/MarkNijhof/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 ff5042c..5aa1ac2 100644
--- a/erlang.mk
+++ b/erlang.mk
@@ -1096,7 +1096,7 @@ RELX_CONFIG ?= $(CURDIR)/relx.config
RELX ?= $(CURDIR)/relx
export RELX
-RELX_URL ?= https://github.com/erlware/relx/releases/download/v1.0.2/relx
+RELX_URL ?= https://github.com/erlware/relx/releases/download/v1.1.0/relx
RELX_OPTS ?=
RELX_OUTPUT_DIR ?= _rel
diff --git a/plugins/relx.mk b/plugins/relx.mk
index ee226d3..8b66277 100644
--- a/plugins/relx.mk
+++ b/plugins/relx.mk
@@ -10,7 +10,7 @@ RELX_CONFIG ?= $(CURDIR)/relx.config
RELX ?= $(CURDIR)/relx
export RELX
-RELX_URL ?= https://github.com/erlware/relx/releases/download/v1.0.2/relx
+RELX_URL ?= https://github.com/erlware/relx/releases/download/v1.1.0/relx
RELX_OPTS ?=
RELX_OUTPUT_DIR ?= _rel