diff options
| author | Hans Bolinder <[email protected]> | 2016-02-24 10:18:56 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2016-02-24 10:18:56 +0100 |
| commit | 95e0c3415fb27ef28da5a7eb178b58b46317a534 (patch) | |
| tree | 02d1e4d4244cfacfd8d7d01623a7848776e96a38 /erts | |
| parent | ae6677714f4f8f1684e9d95997be68930d263d64 (diff) | |
| parent | 6bd691c8e528c2e8cf3aded8f3877b18ecff4c58 (diff) | |
| download | otp-95e0c3415fb27ef28da5a7eb178b58b46317a534.tar.gz otp-95e0c3415fb27ef28da5a7eb178b58b46317a534.tar.bz2 otp-95e0c3415fb27ef28da5a7eb178b58b46317a534.zip | |
Merge branch 'maint'
* maint:
Update preloaded module
typos
Conflicts:
erts/preloaded/ebin/prim_file.beam
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/configure.in | 2 | ||||
| -rw-r--r-- | erts/preloaded/ebin/prim_file.beam | bin | 44800 -> 44800 bytes |
2 files changed, 1 insertions, 1 deletions
diff --git a/erts/configure.in b/erts/configure.in index d84651f4f9..ba735fe921 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -4071,7 +4071,7 @@ AC_ARG_WITH(ssl-rpath, AS_HELP_STRING([--with-ssl-rpath=yes|no|PATHS], [runtime library path for OpenSSL. Default is "yes", which equates to a number of standard locations. If "no", then no runtime - library paths wil be used. Anything else should be a + library paths will be used. Anything else should be a comma separated list of paths.]), [ case X$with_ssl in diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam Binary files differindex a386613eef..426e764127 100644 --- a/erts/preloaded/ebin/prim_file.beam +++ b/erts/preloaded/ebin/prim_file.beam |