| Index: source/data/locales/mer.txt
|
| diff --git a/source/data/locales/mer.txt b/source/data/locales/mer.txt
|
| old mode 100755
|
| new mode 100644
|
| index c66ae993914ea49bca9fb3a1462d57cab870229c..e2cbc3994bdb79d694a98e3f9c2a60b055623f2a
|
| --- a/source/data/locales/mer.txt
|
| +++ b/source/data/locales/mer.txt
|
| @@ -1,11 +1,5 @@
|
| -// ***************************************************************************
|
| -// *
|
| -// * Copyright (C) 2015 International Business Machines
|
| -// * Corporation and others. All Rights Reserved.
|
| -// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
|
| -// * Source File: <path>/common/main/mer.xml
|
| -// *
|
| -// ***************************************************************************
|
| +// © 2016 and later: Unicode, Inc. and others.
|
| +// License & terms of use: http://www.unicode.org/copyright.html#License
|
| mer{
|
| ExemplarCharacters{"[a b c d e f g h i ĩ j k l m n o p q r s t u ũ v w x y z]"}
|
| ExemplarCharactersIndex{"[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]"}
|
| @@ -17,7 +11,7 @@ mer{
|
| }
|
| }
|
| }
|
| - Version{"2.1.19.14"}
|
| + Version{"2.1.27.40"}
|
| calendar{
|
| generic{
|
| DateTimePatterns{
|
| @@ -64,6 +58,10 @@ mer{
|
| "RŨ",
|
| "ŨG",
|
| }
|
| + AmPmMarkersAbbr{
|
| + "RŨ",
|
| + "ŨG",
|
| + }
|
| DateTimePatterns{
|
| "HH:mm:ss zzzz",
|
| "HH:mm:ss z",
|
|
|