diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-28 17:55:28 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-28 17:55:28 +0200 |
| commit | 66d9696596edbc20ad36bf3d5bffb5595e8235c3 (patch) | |
| tree | bbef37c9a90b63d25bee59386cac04298a13846f /strings | |
| parent | 66a58f46e937cdc3d7e0529b52ad8b658d9b2cd4 (diff) | |
| parent | 23af6f5942e7235a7c14a36cb8dd0d2796b5ef37 (diff) | |
| download | mariadb-git-66d9696596edbc20ad36bf3d5bffb5595e8235c3.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-ucs2.c | 2 | ||||
| -rw-r--r-- | strings/ctype-utf8.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c index cae85f38c12..f2bcf69bbc6 100644 --- a/strings/ctype-ucs2.c +++ b/strings/ctype-ucs2.c @@ -1,5 +1,5 @@ /* Copyright (c) 2003, 2013, Oracle and/or its affiliates - Copyright (c) 2009, 2014, SkySQL Ab. + Copyright (c) 2009, 2016, MariaDB This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c index e4eb2832dff..900e2d3500a 100644 --- a/strings/ctype-utf8.c +++ b/strings/ctype-utf8.c @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2013, Oracle and/or its affiliates. - Copyright (c) 2009, 2013, Monty Program Ab + Copyright (c) 2009, 2016, MariaDB This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public |