diff options
| author | Hans Bolinder <[email protected]> | 2011-05-13 14:04:23 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2011-05-13 14:04:23 +0200 |
| commit | 22f3c9720cb7d19a3aafac613f03aede91d6283f (patch) | |
| tree | bc0961a8b4d9377d5e0e19204061f9d12e0ed4a9 /lib/stdlib/include/zip.hrl | |
| parent | 8c3a2a93b6b60253faa8397e5a02206b882b811f (diff) | |
| parent | 76ca320fd37cecdcf225ddcc094bc72a607b0453 (diff) | |
| download | otp-22f3c9720cb7d19a3aafac613f03aede91d6283f.tar.gz otp-22f3c9720cb7d19a3aafac613f03aede91d6283f.tar.bz2 otp-22f3c9720cb7d19a3aafac613f03aede91d6283f.zip | |
Merge branch 'hb/stdlib/specs/OTP-9267' into dev
* hb/stdlib/specs/OTP-9267:
Types and specifications have been modified and added
Conflicts:
lib/stdlib/src/timer.erl
Diffstat (limited to 'lib/stdlib/include/zip.hrl')
| -rw-r--r-- | lib/stdlib/include/zip.hrl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stdlib/include/zip.hrl b/lib/stdlib/include/zip.hrl index 2b5ddc1dfe..6e3ed9c78a 100644 --- a/lib/stdlib/include/zip.hrl +++ b/lib/stdlib/include/zip.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2006-2009. All Rights Reserved. +%% Copyright Ericsson AB 2006-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -19,7 +19,7 @@ -record(zip_file, { name :: string(), % file name - info :: #file_info{}, + info :: file:file_info(), comment :: string(), % zip file comment offset :: non_neg_integer(), % offset of file's local header in archive comp_size :: non_neg_integer() % compressed size |