diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-27 09:21:19 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-27 09:21:19 +0200 |
| commit | 77ce4ead811b606540b9a2cf6d9ce3146a91ab0f (patch) | |
| tree | 5dcd215abf7afd125ad5744697565121b954c1b2 /strings | |
| parent | 677c44f0c37973ad70550d9b807781e688764fae (diff) | |
| parent | d61e5260fb9983ea8dff539b23a6d0a150c2065c (diff) | |
| download | mariadb-git-77ce4ead811b606540b9a2cf6d9ce3146a91ab0f.tar.gz | |
Merge branch '5.5' into 10.0
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 bd1e74becaa..318c248f742 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 bcb07daae03..b4fc6297afd 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 |