aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2013-03-19 15:07:40 +0100
committerBjörn Gustavsson <[email protected]>2013-03-19 15:07:40 +0100
commit087cb864617623392d130c33a98f53d30e8a0758 (patch)
treed7b4612c5744948c183f437c267f4a70abd45fbe /lib
parentf285ee66678ae8761dc82b5ba0c023dd759091fc (diff)
parent7e1256d82d31ffe67cbb840b631b9ea17e6cf0db (diff)
downloadotp-087cb864617623392d130c33a98f53d30e8a0758.tar.gz
otp-087cb864617623392d130c33a98f53d30e8a0758.tar.bz2
otp-087cb864617623392d130c33a98f53d30e8a0758.zip
Merge branch 'bjorn/asn1/fix-latin1-issue' into maint
* bjorn/asn1/fix-latin1-issue: Eliminate latin1 encoded characters
Diffstat (limited to 'lib')
-rw-r--r--lib/asn1/test/asn1_SUITE_data/PartialDecSeq.asn1config8
-rw-r--r--lib/asn1/test/asn1_SUITE_data/testobj.erl2
2 files changed, 1 insertions, 9 deletions
diff --git a/lib/asn1/test/asn1_SUITE_data/PartialDecSeq.asn1config b/lib/asn1/test/asn1_SUITE_data/PartialDecSeq.asn1config
index d388f6cd02..0d91e0c3b3 100644
--- a/lib/asn1/test/asn1_SUITE_data/PartialDecSeq.asn1config
+++ b/lib/asn1/test/asn1_SUITE_data/PartialDecSeq.asn1config
@@ -4,14 +4,6 @@
{selected_decode_F3,['F',fb,b,[1]]},
{selected_decode_F4,['F',fb,d,da,[1],b,a]},
{selected_decode_E1,['E',d,dc,dcc,dcca]}]}}.
-%% partial_incomplete_decode tuplen inneh�ller tv� element. Den
-%% f�rsta �r bara en nyckel den andra �r en tupel med modulnamnet i
-%% en tupel {module,Name} och det andra elementet �r en lista av tupler:
-%% D�r varje tupel beskriver en partiell ofullst�ndig dekod. F�rsta
-%% elementet i den tupeln �r namnet p� funktionen som ska g�ra den
-%% partiella dekodningen. Det andra elementet �r en lista av typnamn/
-%% komponentnamn som �r en sekvens (path) till de element som ej skall
-%% avkodas.
{exclusive_decode,{'PartialDecSeq',
[{decode_F_fb_incomplete,['F',[{fb,[{b,parts},{d,undecoded}]}]]},
{decode_D_incomplete,['D',[{a,undecoded}]]},
diff --git a/lib/asn1/test/asn1_SUITE_data/testobj.erl b/lib/asn1/test/asn1_SUITE_data/testobj.erl
index 8d34a473ae..2cc909c35e 100644
--- a/lib/asn1/test/asn1_SUITE_data/testobj.erl
+++ b/lib/asn1/test/asn1_SUITE_data/testobj.erl
@@ -639,7 +639,7 @@ run_reset_res() ->
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%
-%% Kod f�r att s�tta ihop RANAP-meddelanden
+%% Code for constructing RANAP messages
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%