diff options
| author | Erlang/OTP <[email protected]> | 2016-05-03 10:10:55 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2016-05-03 10:10:55 +0200 |
| commit | 72f65b32bd479b4ebcba09d422ef3716f8cf9ff9 (patch) | |
| tree | d74928717e34e76480ab9e85e7f8bccd8c206953 /lib/inets/src/inets_app/inets.app.src | |
| parent | 49d86a43c207f4825f7242f34a7cc8d3584993a7 (diff) | |
| parent | 4def16a1b087d082360b7cd5d0efe83ee38f0517 (diff) | |
| download | otp-72f65b32bd479b4ebcba09d422ef3716f8cf9ff9.tar.gz otp-72f65b32bd479b4ebcba09d422ef3716f8cf9ff9.tar.bz2 otp-72f65b32bd479b4ebcba09d422ef3716f8cf9ff9.zip | |
Merge branch 'ingela/inets/deprecated-inets_regexp/OTP-13533' into maint-18
* ingela/inets/deprecated-inets_regexp/OTP-13533:
inets: Prepare for release
inets: Put back inets_regexp module in OTP 18
Diffstat (limited to 'lib/inets/src/inets_app/inets.app.src')
| -rw-r--r-- | lib/inets/src/inets_app/inets.app.src | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/inets/src/inets_app/inets.app.src b/lib/inets/src/inets_app/inets.app.src index 2f213794a3..c09139872f 100644 --- a/lib/inets/src/inets_app/inets.app.src +++ b/lib/inets/src/inets_app/inets.app.src @@ -29,6 +29,7 @@ inets_trace, inets_lib, inets_time_compat, + inets_regexp, %% FTP ftp, |