diff options
| author | Lars Thorsen <[email protected]> | 2017-06-05 10:23:09 +0200 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2017-06-05 10:23:09 +0200 |
| commit | 3cfd0ee2fc1edb9b6c613d8efeac2fdc51b3e4ba (patch) | |
| tree | 87ddf34e763c39250d394564c23c169fc612ce25 /lib/xmerl/vsn.mk | |
| parent | 5b014a2d416f8a18fcd17c031d680a32bc6473d8 (diff) | |
| parent | 645371eb3a5cdcdbf73bde2ec906181ec701e1cf (diff) | |
| download | otp-3cfd0ee2fc1edb9b6c613d8efeac2fdc51b3e4ba.tar.gz otp-3cfd0ee2fc1edb9b6c613d8efeac2fdc51b3e4ba.tar.bz2 otp-3cfd0ee2fc1edb9b6c613d8efeac2fdc51b3e4ba.zip | |
Merge branch 'maint'
Conflicts:
OTP_VERSION
erts/vsn.mk
Diffstat (limited to 'lib/xmerl/vsn.mk')
| -rw-r--r-- | lib/xmerl/vsn.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/xmerl/vsn.mk b/lib/xmerl/vsn.mk index 1515a4e37d..4e741d59a8 100644 --- a/lib/xmerl/vsn.mk +++ b/lib/xmerl/vsn.mk @@ -1 +1 @@ -XMERL_VSN = 1.3.13 +XMERL_VSN = 1.3.14 |