diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-09 11:27:40 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-09 11:27:40 +0100 |
| commit | f3444df4153ccbb9ea8db73c1b5de6d7aa6d1334 (patch) | |
| tree | 76c059c29ec0caca19a62dbcbe8efcd22e697692 /include/welcome_copyright_notice.h | |
| parent | c4cb24006139bb6a619ca9d6b00d00c2275d2c28 (diff) | |
| parent | 93a6142dd0c0c8b2e0683e4d57082582eac91fdb (diff) | |
| download | mariadb-git-f3444df4153ccbb9ea8db73c1b5de6d7aa6d1334.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
reverted about half of commits as either not applicable or
outright wrong
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 096d42446bc..e9891856221 100644 --- a/include/welcome_copyright_notice.h +++ b/include/welcome_copyright_notice.h @@ -1,5 +1,5 @@ -/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. - Copyright (c) 2011, 2015, MariaDB +/* Copyright (c) 2011, 2016, Oracle and/or its affiliates. + Copyright (c) 2011, 2016, 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 "2015" +#define COPYRIGHT_NOTICE_CURRENT_YEAR "2016" /* This define specifies copyright notice which is displayed by every MySQL |