diff options
| author | Micael Karlberg <[email protected]> | 2013-11-13 17:20:31 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2013-11-13 17:20:31 +0100 |
| commit | 8bcd32dfceec3b4381747046b82eec42487c7518 (patch) | |
| tree | cca7f396b6b3bd98950e5fc7713dfc9988633b10 /lib/stdlib/src/filelib.erl | |
| parent | dc6f086a0751677da8724df397a062ab154f34cb (diff) | |
| parent | b166476d2674c056ed5f737170074e71fbdc4bfd (diff) | |
| download | otp-8bcd32dfceec3b4381747046b82eec42487c7518.tar.gz otp-8bcd32dfceec3b4381747046b82eec42487c7518.tar.bz2 otp-8bcd32dfceec3b4381747046b82eec42487c7518.zip | |
Merge branch 'bmk/snmp/handling_corrupt_atl_when_converting/r16/OTP-11453' into bmk/snmp/snmp425_integration
Conflicts:
lib/snmp/src/misc/snmp_log.erl
Diffstat (limited to 'lib/stdlib/src/filelib.erl')
| -rw-r--r-- | lib/stdlib/src/filelib.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stdlib/src/filelib.erl b/lib/stdlib/src/filelib.erl index 9ef4954194..b8c0576e56 100644 --- a/lib/stdlib/src/filelib.erl +++ b/lib/stdlib/src/filelib.erl @@ -248,7 +248,7 @@ ensure_dir(F) -> end end. - + %%% %%% Pattern matching using a compiled wildcard. %%% @@ -360,7 +360,7 @@ do_alt([], _File) -> do_list_dir(Dir, Mod) -> eval_list_dir(Dir, Mod). - + %%% Compiling a wildcard. %% Only for debugging. |