aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/inets_app/inets.app.src
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-09-05 13:54:52 +0200
committerMicael Karlberg <[email protected]>2011-09-05 13:54:52 +0200
commitcb1f02ef176767076593a1957506117d9f26dc40 (patch)
tree003de6c319432e38e1dc66a9a9958d9593b98817 /lib/inets/src/inets_app/inets.app.src
parente0db6ad2087d1750de433b1c198ab8cc08872d79 (diff)
parentc4d931d22f446d60fbde0b7d705fe8103bdeaf5f (diff)
downloadotp-cb1f02ef176767076593a1957506117d9f26dc40.tar.gz
otp-cb1f02ef176767076593a1957506117d9f26dc40.tar.bz2
otp-cb1f02ef176767076593a1957506117d9f26dc40.zip
Merge branch 'bmk/inets/httpc/remove_deprecated_module_http/OTP-9359' into bmk/inets/inets58_integration
Diffstat (limited to 'lib/inets/src/inets_app/inets.app.src')
-rw-r--r--lib/inets/src/inets_app/inets.app.src3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/inets/src/inets_app/inets.app.src b/lib/inets/src/inets_app/inets.app.src
index cb036157a5..4d0defb329 100644
--- a/lib/inets/src/inets_app/inets.app.src
+++ b/lib/inets/src/inets_app/inets.app.src
@@ -34,8 +34,7 @@
ftp_sup,
%% HTTP client:
- http, %% Old client API module
- httpc, %% New client API module
+ httpc,
httpc_handler,
httpc_handler_sup,
httpc_manager,