aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2014-06-16Merge branch 'maint'Dan Gudmundsson
2014-06-16Merge branch 'dgud/wx/additional-functionality/OTP-11986' into maintDan Gudmundsson
2014-06-16wx: Fix destroy bugDan Gudmundsson
2014-06-16Merge branch 'maint'Björn Gustavsson
2014-06-16Merge branch 'bjorn/asn1/dialyzer-warnings/OTP-11372' into maintBjörn Gustavsson
2014-06-16Merge branch 'maint'Hans Nilsson
2014-06-16Merge branch 'hans/ssh/decode_encode_fix/OTP-11983' into maintHans Nilsson
2014-06-16ssh: Minor message encode/decode bugfixesHans Nilsson
2014-06-16Merge branch 'maint'Hans Nilsson
2014-06-16Merge branch 'hans/ssh/decode_encode_fix/OTP-11972' into maintHans Nilsson
2014-06-16ssh: Prepare for releaseHans Nilsson
2014-06-16ssh: Accept disconnect msgs without language tagHans Nilsson
2014-06-16Merge branch 'maint'Henrik Nord
2014-06-16Merge branch 'gorillainduction/improve_mnesia_locker_complexity' into maintHenrik Nord
2014-06-16Merge branch 'maint'Ingela Anderton Andin
2014-06-16Merge branch 'ia/ssl/test-cuddle' into maintIngela Anderton Andin
2014-06-13Merge branch 'maint'Sverker Eriksson
2014-06-13Merge branch 'sverk/ethr_aux-cache-align-bug' into maintSverker Eriksson
2014-06-13Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2014-06-13Merge branch 'ia/ssl/dialyzer-specs' into maintIngela Anderton Andin
2014-06-12Merge branch 'maint'Sverker Eriksson
2014-06-12Merge branch 'sverk/etp-alloc-stats' into maintSverker Eriksson
2014-06-12erts: Fix documentation for no of default allocator instancesSverker Eriksson
2014-06-12ssl: Test case stabilityIngela Anderton Andin
2014-06-12ssl: Fix dialyzer specs to reflect realityIngela Anderton Andin
2014-06-12Merge branch 'maint'Marcus Arendt
2014-06-12Merge branch 'marcus/ssh-fix-spelling/OTP-11963' into maintMarcus Arendt
2014-06-12Fix spelling mistakesMarcus Arendt
2014-06-12Merge branch 'maint'Micael Karlberg
2014-06-12Merge branch 'bmk/diameter/fix_appup' into maintMicael Karlberg
2014-06-12erts: Add etp-alloc-stats and etp-alloc-instancesSverker Eriksson
2014-06-12Merge branch 'maint'Björn Gustavsson
2014-06-12Merge branch 'bjorn/kernel/stick-preloaded/OTP-11913' into maintBjörn Gustavsson
2014-06-12Allow unsticking pre-loaded modulesBjörn Gustavsson
2014-06-12Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2014-06-12Merge branch 'ia/ssh/inet-option/OTP-11976' into maintIngela Anderton Andin
2014-06-12Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2014-06-12Merge branch 'ia/ssl/CSS/OTP-11975' into maintIngela Anderton Andin
2014-06-12Merge branch 'maint'Siri Hansen
2014-06-11ssh: Handle inet and inet6 option correctlyIngela Anderton Andin
2014-06-11Merge branch 'siri/ct-and-cover/OTP-11971' into maintSiri Hansen
2014-06-11Corrected module name in appup fileMicael Karlberg
2014-06-11Merge branch 'siri/sync-stop-gen/OTP-11173'Siri Hansen
2014-06-11Merge branch 'ia/ssl/version-argument' into maintIngela Anderton Andin
2014-06-11ssl: Make sure change cipher spec is correctly handledIngela Anderton Andin
2014-06-11Merge branch 'maint'Henrik Nord
2014-06-11Merge remote-tracking branch 'erlang/pr/383' into maintHenrik Nord
2014-06-11Merge branch 'maint'Henrik Nord
2014-06-11Merge branch 'matwey/arm' into maintHenrik Nord
2014-06-11Merge branch 'nox/fix-perms' into maintHenrik Nord