diff options
| author | wollman <wollman@FreeBSD.org> | 2004-12-02 23:01:25 +0000 |
|---|---|---|
| committer | wollman <wollman@FreeBSD.org> | 2004-12-02 23:01:25 +0000 |
| commit | 9fee976b4f91c9158ce17002d1ec3ba8c08999ba (patch) | |
| tree | 6573610dbe2635e968b8653874a3a22b921938ed /share/zoneinfo/europe | |
| parent | b9b9fdbd3f6765fad8f3669da3ea91afe9952b52 (diff) | |
| download | FreeBSD-src-9fee976b4f91c9158ce17002d1ec3ba8c08999ba.zip FreeBSD-src-9fee976b4f91c9158ce17002d1ec3ba8c08999ba.tar.gz | |
Fix import conflicts from tzdata2004g.
Obtained from: ftp://elsie.nci.nih.gov/pub/tzdata2004g.tar.gz
Diffstat (limited to 'share/zoneinfo/europe')
| -rw-r--r-- | share/zoneinfo/europe | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/share/zoneinfo/europe b/share/zoneinfo/europe index eeb114f..04546c7 100644 --- a/share/zoneinfo/europe +++ b/share/zoneinfo/europe @@ -1,4 +1,4 @@ -# @(#)europe 7.88 +# @(#)europe 7.90 # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to @@ -708,7 +708,7 @@ Zone Europe/Sofia 1:33:16 - LMT 1880 # see Serbia and Montenegro # Cyprus -# See the `asia' file. +# Please see the `asia' file for Asia/Nicosia. # Czech Republic # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S @@ -1055,6 +1055,11 @@ Zone Europe/Berlin 0:53:28 - LMT 1893 Apr 1:00 Germany CE%sT 1980 1:00 EU CE%sT +# Georgia +# Please see the "asia" file for Asia/Tbilisi. +# Herodotus (Histories, IV.45) says Georgia north of the Phasis (now Rioni) +# is in Europe. Our reference location Tbilisi is in the Asian part. + # Gibraltar # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Europe/Gibraltar -0:21:24 - LMT 1880 Aug 2 @@ -1611,7 +1616,7 @@ Zone Europe/Oslo 0:43:00 - LMT 1895 Jan 1 # From Paul Eggert (2001-05-01): # # Actually, Jan Mayen was never occupied by Germany during World War II, -# so it must have diverged from Oslo time during the war, as Olso was +# so it must have diverged from Oslo time during the war, as Oslo was # keeping Berlin time. # # <http://home.no.net/janmayen/history.htm> says that the meteorologists |
