summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rickard/xcomp-readme'OTP_17.0-rc2Rickard Green2014-02-262-574/+3
|\
| * Let xcomp/README.md refer to HOWTO/INSTALL-CROSS.mdRickard Green2014-02-262-574/+3
* | Merge branch 'bjorn/erts/fp-exceptions-on-osx'Björn Gustavsson2014-02-261-2/+0
|\ \
| * | Disable accidentally enabled floating point exceptions on MacOS XBjörn Gustavsson2014-02-261-2/+0
| |/
* | Update preloaded and primary bootstrapRickard Green2014-02-2642-15/+31
|/
* Merge branch 'rel-fixes'Hans Nilsson2014-02-261-8/+2
|\
| * ssh: Add appup file correctionsHans Nilsson2014-02-261-8/+2
|/
* Merge branch 'ia/ssl/fix-warnings'Ingela Anderton Andin2014-02-253-19/+16
|\
| * ssl: Fix compiler warningsIngela Anderton Andin2014-02-252-11/+10
| * ssl: Fix appup regexps and instructionsIngela Anderton Andin2014-02-251-8/+6
* | Merge branch 'rel-fixes'Hans Nilsson2014-02-251-2/+0
|\ \
| * | eldap: Prepare for releaseHans Nilsson2014-02-251-2/+0
* | | Merge branch 'rel-fixes'Hans Nilsson2014-02-255-9/+23
|\ \ \ | |/ / | | / | |/ |/|
| * ssh: Prepare for releaseHans Nilsson2014-02-251-3/+5
| * inets: Prepare for releaseHans Nilsson2014-02-252-3/+8
| * eldap: Prepare for releaseHans Nilsson2014-02-252-3/+10
* | Merge branch 'sverk/hipe-disable-gc-bug'Sverker Eriksson2014-02-255-7/+110
|\ \ | |/ |/|
| * erts: Fix heap overwrite by hipe "trap frames" when GC is disabledSverker Eriksson2014-02-254-6/+107
| * ASSERT that GC is not tried with "need" when GC is disabledSverker Eriksson2014-02-201-1/+3
* | Merge branch 'ia/ssl/prepare-for-release'Ingela Anderton Andin2014-02-252-22/+33
|\ \
| * | ssl: Prepare for releaseIngela Anderton Andin2014-02-252-22/+33
* | | Merge branch 'kostis/hipe-tests-bs/OTP-11748'Henrik Nord2014-02-2534-6/+4310
|\ \ \
| * | | Up the time limit (globally) for some slow machinesKostis Sagonas2014-02-241-1/+1
| * | | Add check so that tests are skipped if HiPE is not availableKostis Sagonas2014-02-241-1/+4
| * | | Add a Makefile for the HiPE testsKostis Sagonas2014-02-241-5/+13
| * | | Add tests for the HiPE compiler (Part 1: binaries and bitstrings)Kostis Sagonas2014-02-2433-1/+4294
* | | | Merge branch 'hb/syntax_tools/correct_igor_contract'Hans Bolinder2014-02-251-1/+1
|\ \ \ \
| * | | | Correct a contract in the igor moduleHans Bolinder2014-02-251-1/+1
|/ / / /
* | | | Merge branch 'maint'Hans Nilsson2014-02-240-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'maint-r16' into maintHans Nilsson2014-02-243-30/+43
| |\ \ \ \
| | * \ \ \ Merge branch 'hans/ssh/maint-r16/patch_1261' into maint-r16Hans Nilsson2014-02-243-30/+43
| | |\ \ \ \ | |/ / / / /
* | | | | | Merge branch 'anders/diameter/grouped_decode/OTP-11675'Anders Svensson2014-02-241-10/+113
|\ \ \ \ \ \
| * | | | | | Be lenient with the M-bit in Grouped AVPsAnders Svensson2014-02-241-10/+113
* | | | | | | Updated OTP version to 17.0-rc2Rickard Green2014-02-241-1/+1
* | | | | | | Merge branch 'rickard/otp_version/OTP-11615'Rickard Green2014-02-241-11/+36
|\ \ \ \ \ \ \
| * | | | | | | Update OTP version documentationRickard Green2014-02-241-11/+36
* | | | | | | | Merge branch 'lukas/erts/float_encoding/OTP-11738'Lukas Larsson2014-02-245-15/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | erts: Set default external enc to use new float schemeLukas Larsson2014-02-245-15/+17
* | | | | | | | | Merge branch 'bjorn/gs/warnings'Björn Gustavsson2014-02-242-6/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gs: Turn compiler warnings into errorsBjörn Gustavsson2014-02-241-1/+1
| * | | | | | | | | gs: Eliminate a compiler warningBjörn Gustavsson2014-02-241-5/+5
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'lukas/ose/master/OTP-11334'Lukas Larsson2014-02-24167-1599/+14995
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | erts: Fix unix efile assertLukas Larsson2014-02-241-1/+2
| * | | | | | | | ose: Use -O2 when buildingLukas Larsson2014-02-241-1/+1
| * | | | | | | | ose: Expand OSE docsLukas Larsson2014-02-243-2/+122
| * | | | | | | | ose: Add dummy ttsl driverLukas Larsson2014-02-242-1/+70
| * | | | | | | | ose: Cleanup cleanup of mutex selection definesLukas Larsson2014-02-241-2/+2
| * | | | | | | | ose: Polish mmap configure checksLukas Larsson2014-02-241-2/+2
| * | | | | | | | ose: Add ose specific x-compile flagsLukas Larsson2014-02-241-0/+19
| * | | | | | | | ose: Updating fd_driver and spawn_driver for OSEJonas Karlsson2014-02-241-689/+650