Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jdk
changeset 4989:ec17fbe5b8fb jdk8-b25
Merge
author | katleman |
---|---|
date | Wed, 08 Feb 2012 19:13:58 -0800 |
parents | ce62fb7aa1b8 (current diff) 930756e55285 (diff) |
children | 5aca406e87cb f57d54ebae28 |
files | |
diffstat | 2 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/util/CurrencyData.properties Tue Feb 07 10:38:49 2012 -0800 +++ b/src/share/classes/java/util/CurrencyData.properties Wed Feb 08 19:13:58 2012 -0800 @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -29,7 +29,7 @@ # It is a serial number that accompanies with each amendment, such as # 'MAxxx.doc' -dataVersion=151 +dataVersion=153 # List of all valid ISO 4217 currency codes. # To ensure compatibility, do not remove codes. @@ -583,7 +583,7 @@ minor0=\ ADP-BEF-BIF-BYB-BYR-CLF-CLP-DJF-ESP-GNF-\ GRD-ISK-ITL-JPY-KMF-KRW-LUF-MGF-PYG-PTE-RWF-\ - TPE-TRL-VUV-XAF-XOF-XPF + TPE-TRL-VND-VUV-XAF-XOF-XPF minor1= minor3=\ BHD-IQD-JOD-KWD-LYD-OMR-TND
--- a/test/java/util/Currency/tablea1.txt Tue Feb 07 10:38:49 2012 -0800 +++ b/test/java/util/Currency/tablea1.txt Wed Feb 08 19:13:58 2012 -0800 @@ -1,12 +1,12 @@ # # -# Based on BSi's ISO4217 data - "TABLE A1.doc" + amendments up until MA151.doc -# (As of 7 April 2011) +# Based on BSi's ISO4217 data - "TABLE A1.doc" + amendments up until MA153.doc +# (As of 12 January 2012) # # Version FILEVERSION=1 -DATAVERSION=151 +DATAVERSION=153 # ISO 4217 currency data AF AFN 971 2 @@ -267,7 +267,7 @@ UZ UZS 860 2 VU VUV 548 0 VE VEF 937 2 -VN VND 704 2 +VN VND 704 0 VG USD 840 2 VI USD 840 2 WF XPF 953 0