aboutsummaryrefslogtreecommitdiff
path: root/share/misc
diff options
context:
space:
mode:
authorGarrett Wollman <wollman@FreeBSD.org>2003-08-15 21:10:58 +0000
committerGarrett Wollman <wollman@FreeBSD.org>2003-08-15 21:10:58 +0000
commit3f23dcad957cec8598e93e568f46a56eaa8ee0d0 (patch)
tree2bbf52c1e38523baa93ae38f6945459300b3a36e /share/misc
parentb51206dd9fb697a31bbc3b811b85d78ecd9cbadc (diff)
Notes
Diffstat (limited to 'share/misc')
-rw-r--r--share/misc/iso316615
1 files changed, 14 insertions, 1 deletions
diff --git a/share/misc/iso3166 b/share/misc/iso3166
index c6616a4a1790..4029f4970251 100644
--- a/share/misc/iso3166
+++ b/share/misc/iso3166
@@ -202,6 +202,7 @@ SM SMR 674 San Marino
ST STP 678 Sao Tome and Principe
SA SAU 682 Saudi Arabia
SN SEN 686 Senegal
+CS SCG 891 Serbia and Montenegro
SC SYC 690 Seychelles
SL SLE 694 Sierra Leone
SG SGP 702 Singapore
@@ -252,7 +253,6 @@ VI VIR 850 Virgin Islands (U.S.)
WF WLF 876 Wallis and Futuna Islands
EH ESH 732 Western Sahara
YE YEM 887 Yemen
-YU YUG 891 Yugoslavia
ZM ZMB 894 Zambia
ZW ZWE 716 Zimbabwe
#
@@ -479,3 +479,16 @@ ZW ZWE 716 Zimbabwe
# Newsletter V-5 2002-05-20
# EAST TIMOR changed alpha-2 code from TP to TL and alpha-3 from TMP to TLS.
# Numeric remains 626.
+<<<<<<< iso3166
+=======
+#
+# Newsletter V-6 2002-11-15
+# EAST TIMOR (TL) changed short name to TIMOR-LESTE. Codes unchanged.
+#
+# Newsletter V-7 2003-01-14
+# COMOROS (KM) changed official name, not included in this file.
+#
+# Newsletter V-8 2003-07-23
+# YUGOSLAVIA (YU) changed official name, short name, alpha-2, and alpha-3.
+#
+>>>>>>> 1.12