aboutsummaryrefslogtreecommitdiffstats
path: root/lib/dialyzer
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-09-20 11:19:21 +0200
committerHenrik Nord <[email protected]>2011-09-20 11:19:21 +0200
commitec36499d7e329b4dc69a1a3be3422eac7907c260 (patch)
tree3fae5bd47f85aa8a3ac40519b2328c4451a00c18 /lib/dialyzer
parent532c72b3ffeb9219bdb7e6a7f5d21fe26f0f0629 (diff)
parent53cf0b70c705e0bf6c09f83f2ce2709d79593ce6 (diff)
downloadotp-ec36499d7e329b4dc69a1a3be3422eac7907c260.tar.gz
otp-ec36499d7e329b4dc69a1a3be3422eac7907c260.tar.bz2
otp-ec36499d7e329b4dc69a1a3be3422eac7907c260.zip
Merge branch 'dev' into major
Conflicts: erts/aclocal.m4 erts/include/internal/ethread_header_config.h.in
Diffstat (limited to 'lib/dialyzer')
-rw-r--r--lib/dialyzer/test/small_SUITE_data/src/list_to_bitstring.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/dialyzer/test/small_SUITE_data/src/list_to_bitstring.erl b/lib/dialyzer/test/small_SUITE_data/src/list_to_bitstring.erl
index 2da708cb15..109aa88f16 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/list_to_bitstring.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/list_to_bitstring.erl
@@ -2,7 +2,7 @@
%% From: Ken Robinson
%% Date: 28/04/2011, 17:26
%%
-%% Program that produced borus "Function has no local return" warnings
+%% Program that produced bogus "Function has no local return" warnings
%% due to erlang:list_to_bitstring/1 having erroneous hard coded type
%% information, namely accepting iolist() instead of bitstrlist().
%% Fixed 29/04/2011.