diff options
author | Björn-Egil Dahlberg <[email protected]> | 2011-09-29 18:12:11 +0200 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2011-09-29 18:12:11 +0200 |
commit | 622daf3b96666f8bbabec44a15b26a188a83b95e (patch) | |
tree | 706377087e70525e9bdc68b2f98911d56b915e5d /lib/odbc | |
parent | 09c46998b3a4b0060b3ff3799c142d564f91f517 (diff) | |
parent | 5acac472723ef5cac6a944caf7b7ec4320c003e9 (diff) | |
download | otp-622daf3b96666f8bbabec44a15b26a188a83b95e.tar.gz otp-622daf3b96666f8bbabec44a15b26a188a83b95e.tar.bz2 otp-622daf3b96666f8bbabec44a15b26a188a83b95e.zip |
Merge branch 'dev' into major
* dev:
Update copyright years
Diffstat (limited to 'lib/odbc')
-rw-r--r-- | lib/odbc/c_src/odbcserver.h | 2 | ||||
-rw-r--r-- | lib/odbc/doc/src/databases.xml | 2 | ||||
-rw-r--r-- | lib/odbc/src/odbc_internal.hrl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/odbc/c_src/odbcserver.h b/lib/odbc/c_src/odbcserver.h index 314fbf32c6..56b6148777 100644 --- a/lib/odbc/c_src/odbcserver.h +++ b/lib/odbc/c_src/odbcserver.h @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2002-2010. 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/lib/odbc/doc/src/databases.xml b/lib/odbc/doc/src/databases.xml index 09f5a5af5b..34e1d51255 100644 --- a/lib/odbc/doc/src/databases.xml +++ b/lib/odbc/doc/src/databases.xml @@ -4,7 +4,7 @@ <chapter> <header> <copyright> - <year>2002</year><year>2010</year> + <year>2002</year><year>2011</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> diff --git a/lib/odbc/src/odbc_internal.hrl b/lib/odbc/src/odbc_internal.hrl index c0e7d9657b..bd80cdc659 100644 --- a/lib/odbc/src/odbc_internal.hrl +++ b/lib/odbc/src/odbc_internal.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2002-2010. 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 |