summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nox/maps-improve-erl_expand_records'Björn-Egil Dahlberg2014-02-142-9/+26
|\
| * Fix expansion of records in mapsAnthony Ramine2014-02-042-9/+26
* | Merge branch 'weisslj/ssh-spec-doc-fixes'Henrik Nord2014-02-143-5/+8
|\ \
| * | ssh: Fix dialyzer type specs and documentationJohannes Weißl2014-01-273-5/+8
* | | Merge branch 'galaxie/supress-normal-terminates'Henrik Nord2014-02-141-1/+10
|\ \ \
| * | | Suppress error report when child was terminated normallybell2014-02-141-1/+10
* | | | Merge branch 'vinoski/dialyzer-doc-fix'Henrik Nord2014-02-141-1/+1
|\ \ \ \
| * | | | fix -Wno_behaviours doc error in dialyzer man pageSteve Vinoski2014-01-121-1/+1
| |/ / /
* | | | Merge branch 'calebh/fix-regestry-type-annotation'Henrik Nord2014-02-141-1/+4
|\ \ \ \
| * | | | Fix alternative registry type annotations in supervisorCaleb2014-02-071-1/+4
| | |/ / | |/| |
* | | | Merge branch 'josevalim/jv-persistent-set-env'Henrik Nord2014-02-144-25/+109
|\ \ \ \
| * | | | Allow persistent option on set_env/4 and unset_env/3José Valim2014-02-114-25/+109
| | |/ / | |/| |
* | | | Merge branch 'rickard/default_acul_mod/OTP-11604'Rickard Green2014-02-141-12/+25
|\ \ \ \
| * | | | Fix +Mea configRickard Green2014-01-311-12/+25
* | | | | Merge branch 'vlad/maps-jinterface/OTP-11703'Björn-Egil Dahlberg2014-02-149-3/+452
|\ \ \ \ \
| * | | | | jinterface: Fix jinterface_SUITEBjörn-Egil Dahlberg2014-02-131-2/+5
| * | | | | jinterface: update user's guide with mapsVlad Dumitrescu2014-02-121-0/+4
| * | | | | jinterface: implement support for mapsVlad Dumitrescu2014-02-118-1/+443
* | | | | | Merge branch 'dgud/observer_fixes'Dan Gudmundsson2014-02-147-69/+103
|\ \ \ \ \ \
| * | | | | | observer: catch progressbar errorsDan Gudmundsson2014-02-061-3/+9
| * | | | | | observer: Fix observer crash when closing crashdumpviewerDan Gudmundsson2014-02-041-2/+2
| * | | | | | observer: Fix binary linksDan Gudmundsson2014-02-032-30/+50
| * | | | | | observer: Fix crash when clicking on pid inside a html-termDan Gudmundsson2014-02-034-34/+42
* | | | | | | Merge branch 'bjorn/asn1/fix-enum-bug/OTP-11700'Björn Gustavsson2014-02-143-19/+28
|\ \ \ \ \ \ \
| * | | | | | | Correct subtyping of extensible ENUMERATEDBjörn Gustavsson2014-02-133-19/+28
* | | | | | | | Merge branch 'kostis/beam_validator-minor-fix'Björn Gustavsson2014-02-141-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Change a list comprehension to a foreach/2 callKostis Sagonas2014-02-131-2/+2
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'dgud/misc-cleanup'Dan Gudmundsson2014-02-147-35/+39
|\ \ \ \ \ \ \ \
| * | | | | | | | dbg: Remove debug printouts and fix file dialogDan Gudmundsson2014-02-125-20/+15
| * | | | | | | | sasl: Fix testcase which didn't work on windowsDan Gudmundsson2014-02-121-13/+22
| * | | | | | | | gs: Minor doc fix, gs is deprecatedDan Gudmundsson2014-02-121-2/+2
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'dgud/wx/fix-cb-cleanup/OTP-11699'Dan Gudmundsson2014-02-1430-340/+276
|\ \ \ \ \ \ \ \
| * | | | | | | | wx: Test fixes compilation warningDan Gudmundsson2014-02-131-3/+18
| * | | | | | | | wx: Do not warn for our own deprecated functionsDan Gudmundsson2014-02-1315-21/+63
| * | | | | | | | wx: Rewrite eventhandling againDan Gudmundsson2014-02-1314-316/+195
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'hans/ssh/decodebug/OTP_11698'Hans Nilsson2014-02-131-9/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | ssh: Changed order of decode clauses to temp fix decode errorHans Nilsson2014-02-131-9/+12
|/ / / / / / / /
* | | | | | | | Merge branch 'hans/ssh/membug/OTP_11696'Hans Nilsson2014-02-131-2/+3
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | ssh: Fixes memory crashHans Nilsson2014-02-131-2/+3
|/ / / / / / /
* | | | | | | Update primary bootstrapBjörn Gustavsson2014-02-1315-0/+0
* | | | | | | Merge branch 'bjorn/lc-warnings/OTP-11626' (early part)Björn Gustavsson2014-02-131-8/+14
|\ \ \ \ \ \ \
| * | | | | | | v3_core: Annotate list comprehensions to help out dialyzerBjörn Gustavsson2014-01-311-8/+14
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'nox/compiler/v3_core-case-arg-opt'Björn Gustavsson2014-02-132-2/+82
|\ \ \ \ \ \ \
| * | | | | | | Optimise case arguments in sys_core_foldAnthony Ramine2014-02-111-1/+77
| * | | | | | | Run sys_core_fold twice if any inliner is usedAnthony Ramine2014-02-071-1/+5
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'bjorn/tools/cover/OTP-11692'Björn Gustavsson2014-02-133-134/+111
|\ \ \ \ \ \ \
| * | | | | | | cover: Use lists:reverse/1 instead of the home-brewn reverse functionBjörn Gustavsson2014-02-131-19/+11
| * | | | | | | cover: Remove support for ancient formats of abstract codeBjörn Gustavsson2014-02-131-50/+11
| * | | | | | | cover_SUITE: Run part of the test suite when cover is runningBjörn Gustavsson2014-02-131-20/+69
| * | | | | | | test_server: Allow cover to run on itselfBjörn Gustavsson2014-02-131-2/+0