summaryrefslogtreecommitdiff
path: root/mysql-test/std_data/ldml/latin1.xml
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-05-13 17:47:26 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-05-13 17:54:04 +0300
commit26a14ee1308df65ebb9dda9a8618e64f2f2fc518 (patch)
tree7cad4dffc5fb9f0a8caff5fd62c95a3a8e65ffa8 /mysql-test/std_data/ldml/latin1.xml
parent8ce702aa90c174566f4ac950e85cc7570bf9b647 (diff)
parentcb248f880619431850e5638009a6098048050edf (diff)
downloadmariadb-git-26a14ee1308df65ebb9dda9a8618e64f2f2fc518.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/std_data/ldml/latin1.xml')
-rw-r--r--mysql-test/std_data/ldml/latin1.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/std_data/ldml/latin1.xml b/mysql-test/std_data/ldml/latin1.xml
index 3e1d021c127..47733a570ad 100644
--- a/mysql-test/std_data/ldml/latin1.xml
+++ b/mysql-test/std_data/ldml/latin1.xml
@@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
</copyright>
<charset name="latin1">