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/src/xmerl.app.src | |
| 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/src/xmerl.app.src')
0 files changed, 0 insertions, 0 deletions