diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-02-11 23:50:40 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-11 23:50:40 +0100 |
| commit | 8e80f91fa3e584d6b681bfbb4664e80a255af866 (patch) | |
| tree | af4f13f6f0290ee72b33a0642aa7c03e4e5fcd1c /include/welcome_copyright_notice.h | |
| parent | 63108dc9d2cc9f31ae9927817652be465a17f767 (diff) | |
| parent | 3ee8aa216d55b858ba9e53874359dcac9a82933a (diff) | |
| download | mariadb-git-8e80f91fa3e584d6b681bfbb4664e80a255af866.tar.gz | |
Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42
Diffstat (limited to 'include/welcome_copyright_notice.h')
| -rw-r--r-- | include/welcome_copyright_notice.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/welcome_copyright_notice.h b/include/welcome_copyright_notice.h index 956a9f1c17a..096d42446bc 100644 --- a/include/welcome_copyright_notice.h +++ b/include/welcome_copyright_notice.h @@ -1,5 +1,5 @@ -/* Copyright (c) 2011, 2014, Oracle and/or its affiliates. - Copyright (c) 2011, 2012, Monty Program Ab +/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. + Copyright (c) 2011, 2015, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ #ifndef _welcome_copyright_notice_h_ #define _welcome_copyright_notice_h_ -#define COPYRIGHT_NOTICE_CURRENT_YEAR "2014" +#define COPYRIGHT_NOTICE_CURRENT_YEAR "2015" /* This define specifies copyright notice which is displayed by every MySQL |