diff options
| author | Micael Karlberg <[email protected]> | 2012-01-20 18:40:10 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-01-20 18:40:10 +0100 |
| commit | e8d003e44171f4ed04aaa017b7010ee5746162a9 (patch) | |
| tree | be3b89e0f25d74d59134396e9043277532cf8478 /erts | |
| parent | 5790c87a3c155dbe49b82a8f3b3b74f9fec9d71d (diff) | |
| parent | 4f9b2b2b2917ffca17be3a897674ffe76011237f (diff) | |
| download | otp-e8d003e44171f4ed04aaa017b7010ee5746162a9.tar.gz otp-e8d003e44171f4ed04aaa017b7010ee5746162a9.tar.bz2 otp-e8d003e44171f4ed04aaa017b7010ee5746162a9.zip | |
[inets] Merged from R14B and also fixed appup
Merge from R14B integration branch (for inets-5.7.3) and
fixed appup and corresponding code-change code to work
in new version (inets-5.8.1).
Also some minor (R15B specific) test suite fixes.
Merge branch 'bmk/inets/inets573_integration' into bmk/inets/inets581_integration/r15
Conflicts:
lib/inets/doc/src/notes.xml
lib/inets/src/http_client/httpc_internal.hrl
lib/inets/src/inets_app/inets.appup.src
lib/inets/vsn.mk
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions