aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Expand)Author
2013-08-12Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-08-12Merge branch 'ia/ssl/header-bug/OTP-11230' into maintIngela Anderton Andin
2013-08-08Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-08-08Merge branch 'ia/ssl/setopt-renegotiation-bug/OTP-11228' into maintIngela Anderton Andin
2013-08-08Merge branch 'maint'Lukas Larsson
2013-08-08stdlib: Include file:all datatypes in filelibLukas Larsson
2013-08-08ssl: Revert faulty header option fixIngela Anderton Andin
2013-08-08Merge branch 'maint'Lukas Larsson
2013-08-08Merge branch 'lukas/smoketests/OTP-11221' into maintLukas Larsson
2013-08-08Merge branch 'maint'Fredrik Gustafsson
2013-08-07ssl: Setopts during renegotiation caused the renegotiation to be unsuccessful.Ingela Anderton Andin
2013-08-07fix: typo, inets/doc/src/httpdtomaon
2013-08-07Merge branch 'maint'Fredrik Gustafsson
2013-08-07Merge branch 'fredrik/xmerl/fix_doc/OTP-11224' into maintFredrik Gustafsson
2013-08-07Merge branch 'maint'Peter Andersson
2013-08-07Merge remote branch 'origin/peppe/common_test/ct_log_updates' into maintPeter Andersson
2013-08-06xmerl: fix typosFredrik Gustafsson
2013-08-05Merge branch 'maint'Fredrik Gustafsson
2013-08-05Merge branch 'fredrik/inet/clarify_doc_address/OTP-10676' into maintFredrik Gustafsson
2013-08-05Add smoke testsLukas Larsson
2013-08-05Merge branch 'maint'Fredrik Gustafsson
2013-08-01Fix typo in abcast() function commentJohannes Weißl
2013-08-01Merge branch 'maint'Fredrik Gustafsson
2013-08-01Merge branch 'mmalecki/fix-solaris/OTP-11213' into maintFredrik Gustafsson
2013-07-31Merge branch 'maint'Anders Svensson
2013-07-31Merge branch 'anders/diameter/UTF8String_encode/OTP-11172' into maintAnders Svensson
2013-07-30Simplify Address encode/decodeAnders Svensson
2013-07-30Use module unicode for UTF8String encode/decodeAnders Svensson
2013-07-30Fix UTF8String encodeAnders Svensson
2013-07-30kernel: fixed specs to inet:ntoa/1Fredrik Gustafsson
2013-07-30kernel: changed tests where inet_parse:ntoa/1 was used to inet:parse/1Fredrik Gustafsson
2013-07-30kernel: added ntoa documentation and exported it in inet.erlFredrik Gustafsson
2013-07-30kernel: clarified inet:parse_address/1 referrering to old codeFredrik Gustafsson
2013-07-30Merge branch 'maint'Fredrik Gustafsson
2013-07-30Merge branch 'weisslj/fix-inets-doc-errors/OTP-11210' into maintFredrik Gustafsson
2013-07-30Merge branch 'maint'Fredrik Gustafsson
2013-07-30Merge branch 'nox/eunit-macros-blocks' into maintFredrik Gustafsson
2013-07-29Merge branch 'maint'Fredrik Gustafsson
2013-07-29Merge branch 'nox/fix-comp-warnings/OTP-11212' into maintFredrik Gustafsson
2013-07-29Merge branch 'maint'Fredrik Gustafsson
2013-07-29Merge branch 'nox/fix-fname-inlining/OTP-11211' into maintFredrik Gustafsson
2013-07-26Fix compilation on SolarisMaciej Małecki
2013-07-24Merge branch 'maint'Björn-Egil Dahlberg
2013-07-24Merge branch 'sb/fix-alignment-q-command/OTP-11209' into maintBjörn-Egil Dahlberg
2013-07-24Merge branch 'maint'Björn-Egil Dahlberg
2013-07-24Merge branch 'jv/update-io_prompt-type/OTP-11208' into maintBjörn-Egil Dahlberg
2013-07-24Merge branch 'jv/filelib-types/OTP-11208' into maintBjörn-Egil Dahlberg
2013-07-24Fix some errors in the inets documentationJohannes Weißl
2013-07-23Merge branch 'maint'Anders Svensson
2013-07-23Merge branch 'anders/diameter/inappropriate_DWR/OTP-11184' into maintAnders Svensson