summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nox/match-context-return' into pupuFredrik Gustafsson2013-08-014-2/+23
|\
| * Added primary bootstrapFredrik Gustafsson2013-08-011-0/+0
| * Forbid returning a match context in beam_validatorAnthony Ramine2013-08-013-2/+23
* | Merge branch 'epa/add_fd_usage_in_rb' into puFredrik Gustafsson2013-08-013-26/+96
|\ \
| * | kernel: sasl: fixed rb.xml docsFredrik Gustafsson2013-08-011-1/+0
| * | Add Fd usage in rb loggingcrownedgrouse2013-07-133-26/+97
* | | Merge branch 'sg/odbcserver_crash_fix' into puFredrik Gustafsson2013-08-011-0/+12
|\ \ \
| * | | Added a few input checks which prevent odbcserver crash if it's executedSergei Golovan2013-06-271-0/+12
* | | | Merge branch 'hm/reltool_script' into puFredrik Gustafsson2013-08-0116-268/+1074
|\ \ \ \
| * | | | Publish reltool scriptHåkan Mattsson2013-06-2616-268/+1074
| |/ / /
* | | | Merge branch 'jw/fix-httpd-erl-script-nocache' into puFredrik Gustafsson2013-08-013-5/+5
|\ \ \ \
| * | | | Fix httpd config option 'erl_script_nocache'Johannes Weißl2013-06-223-5/+5
| |/ / /
* | | | Merge branch 'lpg/openssh_zlib' into puFredrik Gustafsson2013-08-013-7/+37
|\ \ \ \
| * | | | Add openssh_zlib compression type to ssh_transportLouis-Philippe Gauthier2013-06-203-7/+37
* | | | | Merge branch 'mh/line-initial-commas' into puFredrik Gustafsson2013-08-013-0/+65
|\ \ \ \ \
| * | | | | Inside parentheses, line-initial commas align with the open parenthesisMagnus Henoch2013-06-183-0/+65
| |/ / / /
* | | | | Merge branch 'ali/fix-inet-typespec' into puFredrik Gustafsson2013-08-011-2/+13
|\ \ \ \ \
| * | | | | Fix the typespec for the inet:ifget/2 and inet:ifget/3 return valueAli Sabil2013-06-191-2/+13
| |/ / / /
* | | | | Merge branch 'nox/fix-erl_lint-variable-usage' into puFredrik Gustafsson2013-08-012-22/+75
|\ \ \ \ \
| * | | | | Fix variable usage tracking in some record errorsAnthony Ramine2013-07-312-2/+9
| * | | | | Fix unsafe variable tracking in try expressionsAnthony Ramine2013-07-222-2/+19
| * | | | | Fix variable usage tracking in erl_lintAnthony Ramine2013-07-012-20/+49
* | | | | | Merge branch 'epa/fix_io_noreturn_with_self_pid' into puFredrik Gustafsson2013-08-011-0/+2
|\ \ \ \ \ \
| * | | | | | Fix no return of io functions when self() used as Iodevicecrownedgrouse2013-06-031-0/+2
* | | | | | | Merge branch 'feat/erl_tidy_print_to_stdout' into puFredrik Gustafsson2013-08-011-3/+20
|\ \ \ \ \ \ \
| * | | | | | | Added documenation for the new option describing what it does.Aaron2013-06-021-0/+7
| * | | | | | | Changed function call for print_moduleAaron2013-06-021-1/+1
| * | | | | | | Added an initial implementation of having erl_tidy print to screen instead of...Aaron2013-06-021-3/+13
* | | | | | | | Merge branch 'nox/igor-funs' into puFredrik Gustafsson2013-08-013-29/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove a useless function clause in erl_syntax_libAnthony Ramine2013-05-191-2/+0
| * | | | | | | | Fix transformation of implicit funs in igorAnthony Ramine2013-05-181-14/+19
| * | | | | | | | Fix reverting of implicit funsAnthony Ramine2013-05-181-13/+6
* | | | | | | | | Merge branch 'yi/fix_eunit_io_protocol' into puFredrik Gustafsson2013-08-011-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix I/O-protocol error handling in eunitYuki Ito2013-05-101-3/+3
| |/ / / / / / / /
* | | | | | | | | Merge branch 'sze/limit_max_length_int_shell' into puFredrik Gustafsson2013-08-014-13/+101
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Limit maximum line length in interactive shellsStefan Zegenhagen2013-05-084-13/+101
* | | | | | | | | | Merge branch 'sze/edlin_understand_keys' into puFredrik Gustafsson2013-08-012-0/+30
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added primary bootstrapFredrik Gustafsson2013-05-061-0/+0
| * | | | | | | | | | make edlin understand a few important control keysStefan Zegenhagen2013-05-061-0/+30
* | | | | | | | | | | Merge branch 'ao/fix_mnesia_block_table_exception' into puFredrik Gustafsson2013-08-011-3/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix crash in mnesia_controller due to a function_clause exception from is_tab...Ahmed Omar2013-05-021-3/+7
* | | | | | | | | | | | Merge branch 'dg/win_icon' into puFredrik Gustafsson2013-08-011-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | add hires images to windows application iconDaniel Goertzen2012-09-071-0/+0
* | | | | | | | | | | | | Merge branch 'anders/diameter/UTF8String_encode/OTP-11172' into maintAnders Svensson2013-07-313-128/+111
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Simplify Address encode/decodeAnders Svensson2013-07-302-43/+18
| * | | | | | | | | | | | | Use module unicode for UTF8String encode/decodeAnders Svensson2013-07-301-25/+2
| * | | | | | | | | | | | | Fix UTF8String encodeAnders Svensson2013-07-303-69/+100
* | | | | | | | | | | | | | Merge branch 'weisslj/fix-inets-doc-errors/OTP-11210' into maintFredrik Gustafsson2013-07-305-19/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix some errors in the inets documentationJohannes Weißl2013-07-245-19/+19
* | | | | | | | | | | | | | | Merge branch 'nox/eunit-macros-blocks' into maintFredrik Gustafsson2013-07-301-20/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \