aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2014-06-16[test_server] Fix bug introduced in 5a3c466Siri Hansen
2014-06-16Merge branch 'jjhoo/mingw_compile_fix_forceinline/OTP-11945' into maintRickard Green
2014-06-16Fix redefinition of ETHR_FORCE_INLINERickard Green
2014-06-16Merge branch 'siri/reltool-typo/OTP-11977' into maintSiri Hansen
2014-06-16Merge branch 'peppe/common_test/ct_basic_html_error' into maintPeter Andersson
2014-06-16Merge branch 'peppe/common_test/ct_log_cache_error' into maintPeter Andersson
2014-06-16Fix handling of latin1 characters in false ifdef branchesBjörn Gustavsson
2014-06-16Merge branch 'dgud/wx/additional-functionality/OTP-11986' into maintDan Gudmundsson
2014-06-16wx: Fix destroy bugDan Gudmundsson
2014-06-16Merge branch 'bjorn/asn1/dialyzer-warnings/OTP-11372' into maintBjörn Gustavsson
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 '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 'gorillainduction/improve_mnesia_locker_complexity' into maintHenrik Nord
2014-06-16Merge branch 'ia/ssl/test-cuddle' into maintIngela Anderton Andin
2014-06-13Merge branch 'sverk/ethr_aux-cache-align-bug' into maintSverker Eriksson
2014-06-13Merge branch 'ia/ssl/dialyzer-specs' into maintIngela Anderton Andin
2014-06-13add_abstract_code: Remove 'from_asm' optionBjörn Gustavsson
2014-06-13Remove documentation and stub for non-exist file:file_info/1Björn Gustavsson
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 'marcus/ssh-fix-spelling/OTP-11963' into maintMarcus Arendt
2014-06-12Fix spelling mistakesMarcus Arendt
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-12Fix typo in error message in reltool_serverSiri Hansen
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 branch 'ia/ssh/inet-option/OTP-11976' into maintIngela Anderton Andin
2014-06-12Merge branch 'ia/ssl/CSS/OTP-11975' into maintIngela Anderton Andin
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 'ia/ssl/version-argument' into maintIngela Anderton Andin
2014-06-11ssl: Make sure change cipher spec is correctly handledIngela Anderton Andin
2014-06-11Merge remote-tracking branch 'erlang/pr/383' into maintHenrik Nord
2014-06-11Merge branch 'matwey/arm' into maintHenrik Nord
2014-06-11Merge branch 'nox/fix-perms' into maintHenrik Nord
2014-06-11Merge branch 'qrilka/ssl-seconds-in-24h' into maintHenrik Nord
2014-06-11Merge branch 'telsacolton/snmp_test_manager_badmatch_pid' into maintHenrik Nord
2014-06-11Merge branch 'pguyot/fix_srp' into maintHenrik Nord
2014-06-06Merge branch 'jjhoo/mingw_compile_fix_forceinline/OTP-11945' into maintRickard Green
2014-06-06Merge branch 'rickard/invalid_bitstr_bifs/OTP-11942' into maintRickard Green
2014-06-06Merge branch 'rickard/binary_to_term_error/OTP-11931' into maintRickard Green
2014-06-06Merge branch 'rickard/yielding-binary-list-conversions/OTP-11888' into maintRickard Green
2014-06-06Merge branch 'rickard/disable-gc-fix/OTP-11887' into maintRickard Green