diff options
author | Sergei Golubchik <serg@mariadb.org> | 2017-04-21 18:34:06 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2017-04-21 18:34:06 +0200 |
commit | 8d75a7533ee80efa5275a058dfadf8947e5857a6 (patch) | |
tree | 463cddda9c516dc3cd7c3e94fb08910210473622 /include/welcome_copyright_notice.h | |
parent | e056d1f1ca91ebe40467ed46be00be0add9cf247 (diff) | |
parent | c6ee3fe9d4056dcd6ee9f9aabd3424c1b27fc506 (diff) | |
download | mariadb-git-8d75a7533ee80efa5275a058dfadf8947e5857a6.tar.gz |
Merge branch '5.5' into 10.0
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 e9891856221..cd7cd6692be 100644 --- a/include/welcome_copyright_notice.h +++ b/include/welcome_copyright_notice.h @@ -1,5 +1,5 @@ -/* Copyright (c) 2011, 2016, Oracle and/or its affiliates. - Copyright (c) 2011, 2016, MariaDB +/* Copyright (c) 2011, 2017, Oracle and/or its affiliates. + Copyright (c) 2011, 2017, 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 "2016" +#define COPYRIGHT_NOTICE_CURRENT_YEAR "2017" /* This define specifies copyright notice which is displayed by every MySQL |