diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2014-01-03 17:51:28 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2014-01-03 17:51:28 +0000 |
commit | f71e9a28759c1f5d6e8dc0baced440e72507b433 (patch) | |
tree | d1ef7f1f84de67d0446b60c04f10a47c84ac1ddc /libc/localedata/locales/de_DE@euro | |
parent | 036dfd44bcc8ed8e97dcd9c763f61d3b59796941 (diff) |
Merge changes between r24468 and r24941 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@24942 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/localedata/locales/de_DE@euro')
-rw-r--r-- | libc/localedata/locales/de_DE@euro | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libc/localedata/locales/de_DE@euro b/libc/localedata/locales/de_DE@euro index 7e9c97a73..cc7e07338 100644 --- a/libc/localedata/locales/de_DE@euro +++ b/libc/localedata/locales/de_DE@euro @@ -27,7 +27,7 @@ category "de_DE@euro:2000";LC_PAPER category "de_DE@euro:2000";LC_NAME category "de_DE@euro:2000";LC_ADDRESS category "de_DE@euro:2000";LC_TELEPHONE - +category "de_DE@euro:2000";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -75,5 +75,6 @@ copy "de_DE" END LC_TELEPHONE LC_MEASUREMENT -copy "de_DE" +% metric +measurement 1 END LC_MEASUREMENT |