Merge jdk8-b25
authorkatleman
Wed, 08 Feb 2012 19:13:58 -0800
changeset 5028ec17fbe5b8fb
parent 5025 ce62fb7aa1b8
parent 5027 930756e55285
child 5029 5aca406e87cb
child 5172 f57d54ebae28
Merge
     1.1 --- a/src/share/classes/java/util/CurrencyData.properties	Tue Feb 07 10:38:49 2012 -0800
     1.2 +++ b/src/share/classes/java/util/CurrencyData.properties	Wed Feb 08 19:13:58 2012 -0800
     1.3 @@ -1,5 +1,5 @@
     1.4  #
     1.5 -# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
     1.6 +# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
     1.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8  #
     1.9  # This code is free software; you can redistribute it and/or modify it
    1.10 @@ -29,7 +29,7 @@
    1.11  # It is a serial number that accompanies with each amendment, such as 
    1.12  # 'MAxxx.doc'
    1.13  
    1.14 -dataVersion=151
    1.15 +dataVersion=153
    1.16  
    1.17  # List of all valid ISO 4217 currency codes.
    1.18  # To ensure compatibility, do not remove codes.
    1.19 @@ -583,7 +583,7 @@
    1.20  minor0=\
    1.21      ADP-BEF-BIF-BYB-BYR-CLF-CLP-DJF-ESP-GNF-\
    1.22      GRD-ISK-ITL-JPY-KMF-KRW-LUF-MGF-PYG-PTE-RWF-\
    1.23 -    TPE-TRL-VUV-XAF-XOF-XPF
    1.24 +    TPE-TRL-VND-VUV-XAF-XOF-XPF
    1.25  minor1=
    1.26  minor3=\
    1.27      BHD-IQD-JOD-KWD-LYD-OMR-TND
     2.1 --- a/test/java/util/Currency/tablea1.txt	Tue Feb 07 10:38:49 2012 -0800
     2.2 +++ b/test/java/util/Currency/tablea1.txt	Wed Feb 08 19:13:58 2012 -0800
     2.3 @@ -1,12 +1,12 @@
     2.4  #
     2.5  #
     2.6 -# Based on BSi's ISO4217 data - "TABLE A1.doc" + amendments up until MA151.doc
     2.7 -#   (As of 7 April 2011)
     2.8 +# Based on BSi's ISO4217 data - "TABLE A1.doc" + amendments up until MA153.doc
     2.9 +#   (As of 12 January 2012)
    2.10  #
    2.11  
    2.12  # Version
    2.13  FILEVERSION=1
    2.14 -DATAVERSION=151
    2.15 +DATAVERSION=153
    2.16  
    2.17  # ISO 4217 currency data
    2.18  AF	AFN	971	2
    2.19 @@ -267,7 +267,7 @@
    2.20  UZ	UZS	860	2
    2.21  VU	VUV	548	0
    2.22  VE	VEF	937	2
    2.23 -VN	VND	704	2
    2.24 +VN	VND	704	0
    2.25  VG	USD	840	2
    2.26  VI	USD	840	2
    2.27  WF	XPF	953	0