diff options
| author | Fredrik Gustafsson <[email protected]> | 2012-08-23 10:57:50 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2012-08-23 10:57:50 +0200 |
| commit | d3ba4c96e621d4e68e38926f051aadd2b0869dc9 (patch) | |
| tree | d4fc0f35f41d9c9e1674af29510e797a118220fc /lib/stdlib/src/erl_scan.erl | |
| parent | 064b42237d891d5fdcb6c1a351980b8291437618 (diff) | |
| parent | e7720fe2b2a1f09af70e74b54442f72f84609a31 (diff) | |
| download | otp-d3ba4c96e621d4e68e38926f051aadd2b0869dc9.tar.gz otp-d3ba4c96e621d4e68e38926f051aadd2b0869dc9.tar.bz2 otp-d3ba4c96e621d4e68e38926f051aadd2b0869dc9.zip | |
Merge branch 'maint' of super:otp into maint
* 'maint' of super:otp:
Revert "Merge branch 'nox/compile-column-numbers' into maint"
compiler: Warn if the size of a binary segment is invalid
Allow non-ASCII characters in Xref filanmes
Add powerpc dso xcomp file
Diffstat (limited to 'lib/stdlib/src/erl_scan.erl')
| -rw-r--r-- | lib/stdlib/src/erl_scan.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/src/erl_scan.erl b/lib/stdlib/src/erl_scan.erl index be64b428b1..10b2ed2e49 100644 --- a/lib/stdlib/src/erl_scan.erl +++ b/lib/stdlib/src/erl_scan.erl @@ -55,7 +55,7 @@ token_info/1,token_info/2, attributes_info/1,attributes_info/2,set_attribute/3]). --export_type([error_info/0, line/0, location/0, tokens_result/0]). +-export_type([error_info/0, line/0, tokens_result/0]). %%% %%% Defines and type definitions |