aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2015-12-04Merge branch 'maint'Lars Thorsen
2015-12-04Merge branch 'lars/xmllint-incorrect-errors/OTP-13026' into maintLars Thorsen
2015-12-04Merge branch 'maint'Dan Gudmundsson
2015-12-04Merge branch 'dgud/wx/rewrite-cmd-loop/OTP-13160' into maintDan Gudmundsson
2015-12-04Merge branch 'maint'Björn Gustavsson
2015-12-04Merge branch 'bjorn/stdlib/fix-erl_lint-bugs/OTP-13157' into maintBjörn Gustavsson
2015-12-04Merge branch 'maint'Zandra
2015-12-04Merge branch 'zandra/rm-eunit-assertReceive' into maintZandra
2015-12-04Merge branch 'maint'Zandra
2015-12-04Merge branch 'mikpe/hipe_x86_signal-musl-support' into maintZandra
2015-12-03wx: Fix some function specificationsDan Gudmundsson
2015-12-03Extend erl_lint:format_error/1 to handle bittype mismatchesBjörn Gustavsson
2015-12-03erl_lint_SUITE: Add smoke test of format_error/1Björn Gustavsson
2015-12-03Merge branch 'maint'Björn Gustavsson
2015-12-03Merge branch 'bjorn/asn1/empty-named-bit-string/OTP-13149' into maintBjörn Gustavsson
2015-12-03Merge branch 'maint'Siri Hansen
2015-12-03Merge branch 'siri/ct_netconfc/log-silent/OTP-13035' into maintSiri Hansen
2015-12-03rm assertReceive, due to a leftover of a conflict resolutionZandra
2015-12-03Merge branch 'maint'Zandra
2015-12-03Merge branch 'swvist/topic/ssh-key-callback-options' into maintZandra
2015-12-02Merge branch 'egil/fix-seq_trace'Björn-Egil Dahlberg
2015-12-02Merge branch 'maint'Raimo Niskanen
2015-12-02Merge branch 'soranoba/fix-file-position/PR-646' into maintRaimo Niskanen
2015-12-02Merge branch 'maint'Siri Hansen
2015-12-02Merge branch 'siri/ct_netconfc/clear-timer/OTP-13008' into maintSiri Hansen
2015-12-01Support SSH key callback module optionsVipin Nair
2015-12-01Merge branch 'maint'Zandra
2015-12-01Merge branch 'legoscia/tls_dist_options' into maintZandra
2015-12-01wx: Remove call to disconnect_impl from serverDan Gudmundsson
2015-12-01Merge branch 'lexmag/bin-gen-pattern-bytes'Zandra
2015-12-01Merge branch 'maint'Zandra
2015-12-01Merge branch 'scrapinghub/sni_with_connect' into maintZandra
2015-12-01Merge branch 'maint'Ingela Anderton Andin
2015-12-01Merge branch 'ia/inets/esi-timeout/OTP-13110' into maintIngela Anderton Andin
2015-11-30Merge branch 'maint'Sverker Eriksson
2015-11-30Merge branch 'sverk/rare-gc-map-overflow/OTP-13146' into maintSverker Eriksson
2015-11-30Merge branch 'maint'Rickard Green
2015-11-30Merge branch 'rickard/erts-print/OTP-13150' into maintRickard Green
2015-11-30Remove ERTS_PRINT_INVALID from erts_print()Rickard Green
2015-11-30BER: Fix encoding of empty named BIT STRINGBjörn Gustavsson
2015-11-30[erl_docgen] Allow br in the tag of tagged listsLars Thorsen
2015-11-30[erl_docgen] Add conversion of the i tag in the XSL specsLars Thorsen
2015-11-30[erl_docgen] Correct DTD for tags anno, fsummary and add an tag i (italic).Lars Thorsen
2015-11-30[erl_docgen] Correct faults in the dtdLars Thorsen
2015-11-30Change xmllint targetLars Thorsen
2015-11-30[erl_docgen] Update DTD for anno tagLars Thorsen
2015-11-27erts: Fix rare case of faulty heap fragment deallocationSverker Eriksson
2015-11-27inets: Add warning header in "chunk trailer" when mod_esi callback times out ...Ingela Anderton Andin
2015-11-27inets: Remove exit that generates an incorrect internal server errorIngela Anderton Andin
2015-11-27Merge branch 'maint'Hans Nilsson