aboutsummaryrefslogtreecommitdiffstats
path: root/lib/megaco
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-09-23 16:13:43 +0200
committerMicael Karlberg <[email protected]>2011-09-23 16:13:43 +0200
commit1ead5e977d307ae391fdfd34e28fa5d587db2855 (patch)
treeb5324d56ca67a1f427b876f03536d98025f31945 /lib/megaco
parent92657321ac647f343c6b88985d66a2d611fd982d (diff)
parent55bb3e1faf613c51ec59c9ee7ab4b4e967f30fda (diff)
downloadotp-1ead5e977d307ae391fdfd34e28fa5d587db2855.tar.gz
otp-1ead5e977d307ae391fdfd34e28fa5d587db2855.tar.bz2
otp-1ead5e977d307ae391fdfd34e28fa5d587db2855.zip
Merge branch 'dev' into major
Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/inets_app/inets.appup.src lib/inets/test/httpc_cookie_SUITE.erl lib/inets/vsn.mk
Diffstat (limited to 'lib/megaco')
0 files changed, 0 insertions, 0 deletions