aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2014-01-21Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2014-01-21Merge branch 'ia/ssl/ECC-curve-selection/OTP-11575' into maintIngela Anderton Andin
2014-01-21Merge branch 'ia/ssl/server-name-indication-missing-option-validation/OTP-115...Ingela Anderton Andin
2014-01-21Merge branch 'hawk/reltool_undefined_regexp'Henrik Nord
2014-01-21Merge branch 'hawk/reltool_test_server'Henrik Nord
2014-01-21Merge branch 'djc/tinfo-ncurses'Henrik Nord
2014-01-21Merge branch 'josevalim/jv-console-i'Henrik Nord
2014-01-20Merge branch 'sverk/term2bin-simplify'Sverker Eriksson
2014-01-20Merge branch 'rickard/consume_timeslice-testcase-fix'Rickard Green
2014-01-20Fix testcase driver_SUITE:consume_timesliceRickard Green
2014-01-20Merge branch 'sverk/jinterface/unicode-test-bug'Sverker Eriksson
2014-01-20Merge branch 'sverk/bin2term-int-size-estimation-bug'Sverker Eriksson
2014-01-20Update primary bootstrapBjörn Gustavsson
2014-01-20Merge branch 'bjorn/compiler/optimizations/OTP-11584'Björn Gustavsson
2014-01-20Merge branch 'bjorn/fix-line-number-in-bs-exception/OTP-11572'Björn Gustavsson
2014-01-20Merge branch 'bjorn/compiler/fix-lift-after/OTP-11580'Björn Gustavsson
2014-01-20Merge branch 'egil/etp-commands/OTP-11582'Björn-Egil Dahlberg
2014-01-20Merge branch 'egil/fix-bs_get_integer/OTP-11581'Björn-Egil Dahlberg
2014-01-17compiler: Silence false warning for unmatched return in 'after' clauseBjörn Gustavsson
2014-01-17Merge branch 'fenollp/escript-doc-chmod'Henrik Nord
2014-01-17Merge branch 'RoadRunnr/ecdh_crypto'Henrik Nord
2014-01-17erts: Refactor ESTACK & WSTACK to use a struct easy to "export"Sverker Eriksson
2014-01-16Merge branch 'rickard/ts_install_mXX_build'Rickard Green
2014-01-16Teach ts_install --enable-mXX-build flagRickard Green
2014-01-16Merge branch 'maint'Björn-Egil Dahlberg
2014-01-16jinterface: Fix unicode bug in test codeSverker Eriksson
2014-01-16Generalize optimizations of case statementsBjörn Gustavsson
2014-01-16compiler: Correct line number in exception from binary constructionBjörn Gustavsson
2014-01-15erts: Fix benign ESTACK/WSTACK typoSverker Eriksson
2014-01-15erts: Fix compiler warnings for NO_JUMP_TABLESverker Eriksson
2014-01-15ssl: Prepare for releaseIngela Anderton Andin
2014-01-14ssl: fix elliptic curve selection in server modeAndreas Schultz
2014-01-14ssl: Prepare for releaseIngela Anderton Andin
2014-01-14Merge branch 'nox/odbcserver-tolower'Henrik Nord
2014-01-14ssl: Add missing options validation of server_name_indicationIngela Anderton Andin
2014-01-14Merge branch 'puzza007/remove-query-reserved-word-from-emacs-mode'Henrik Nord
2014-01-14Update system versionBjörn-Egil Dahlberg
2014-01-14Merge branch 'ad/ssh_expand_test'Henrik Nord
2014-01-14Merge branch 'weisslj/fix-epmd-names-win32'Henrik Nord
2014-01-14epmd: Fix -names option on WindowsJohannes Weißl
2014-01-14Merge branch 'weisslj/fix-hipe-no-remove-comments'Henrik Nord
2014-01-13Merge branch 'rickard/otp-17-vsn-fix'Rickard Green
2014-01-13crypto: selective support for GF2m curvesAndreas Schultz
2014-01-13ssl: add brainpool elliptic curves to TLS (RFC-7027)Andreas Schultz
2014-01-13public_key: add brainpool elliptic curves (RFC-5639)Andreas Schultz
2014-01-13crypto: document ec_curves/0 and ec_curve/1Andreas Schultz
2014-01-13crypto: add brainpool (RFC 5639) curvesAndreas Schultz
2014-01-13crypto: move elitic curve definitions from OpenSSL built-ins to ErlangAndreas Schultz
2014-01-13crypto: add ECDH test vectors for more curvesAndreas Schultz
2014-01-13Merge branch 'lukas/erts/win-icon/OTP-11560'Lukas Larsson