diff options
| author | Anders Svensson <[email protected]> | 2011-06-27 16:43:37 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2011-06-27 16:43:37 +0200 |
| commit | bd6666300edb76e09c07508e3513f7bdde985b43 (patch) | |
| tree | 1e735ae4a1ab2b63597f43ec342cefcd77513563 /bootstrap/lib/stdlib/include | |
| parent | 916e80959746c467ff858538e35f3c0105dbbced (diff) | |
| parent | 1049243404cc52cad5ce1f1d2d37383a2ca06160 (diff) | |
| download | otp-bd6666300edb76e09c07508e3513f7bdde985b43.tar.gz otp-bd6666300edb76e09c07508e3513f7bdde985b43.tar.bz2 otp-bd6666300edb76e09c07508e3513f7bdde985b43.zip | |
Merge remote branch 'upstream/dev' into dev
Diffstat (limited to 'bootstrap/lib/stdlib/include')
| -rw-r--r-- | bootstrap/lib/stdlib/include/erl_bits.hrl | 2 | ||||
| -rw-r--r-- | bootstrap/lib/stdlib/include/erl_compile.hrl | 2 | ||||
| -rw-r--r-- | bootstrap/lib/stdlib/include/ms_transform.hrl | 2 | ||||
| -rw-r--r-- | bootstrap/lib/stdlib/include/qlc.hrl | 2 | ||||
| -rw-r--r-- | bootstrap/lib/stdlib/include/zip.hrl | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/bootstrap/lib/stdlib/include/erl_bits.hrl b/bootstrap/lib/stdlib/include/erl_bits.hrl index 54ebe58585..aca213c08c 100644 --- a/bootstrap/lib/stdlib/include/erl_bits.hrl +++ b/bootstrap/lib/stdlib/include/erl_bits.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2009. All Rights Reserved. +%% Copyright Ericsson AB 1999-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 diff --git a/bootstrap/lib/stdlib/include/erl_compile.hrl b/bootstrap/lib/stdlib/include/erl_compile.hrl index f779c4382c..2e0d90dfad 100644 --- a/bootstrap/lib/stdlib/include/erl_compile.hrl +++ b/bootstrap/lib/stdlib/include/erl_compile.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2009. All Rights Reserved. +%% Copyright Ericsson AB 1997-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 diff --git a/bootstrap/lib/stdlib/include/ms_transform.hrl b/bootstrap/lib/stdlib/include/ms_transform.hrl index 9937d48fef..2b89a4df2f 100644 --- a/bootstrap/lib/stdlib/include/ms_transform.hrl +++ b/bootstrap/lib/stdlib/include/ms_transform.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2002-2009. All Rights Reserved. +%% Copyright Ericsson AB 2002-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 diff --git a/bootstrap/lib/stdlib/include/qlc.hrl b/bootstrap/lib/stdlib/include/qlc.hrl index 067fb83060..cccedcbd2c 100644 --- a/bootstrap/lib/stdlib/include/qlc.hrl +++ b/bootstrap/lib/stdlib/include/qlc.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2009. All Rights Reserved. +%% Copyright Ericsson AB 2004-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 diff --git a/bootstrap/lib/stdlib/include/zip.hrl b/bootstrap/lib/stdlib/include/zip.hrl index 2b5ddc1dfe..6e3ed9c78a 100644 --- a/bootstrap/lib/stdlib/include/zip.hrl +++ b/bootstrap/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 |