aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorduerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-14 01:45:52 +0000
committerduerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-14 01:45:52 +0000
commit5f31c7b54819917b41bcb06ac7761caf2c94da81 (patch)
treef4e1ef65b5751aa7046fdc7933f048f75f228dc2
parent669e94a31422283dac62c514cb2e65f4f79cbed6 (diff)
downloadruby-5f31c7b54819917b41bcb06ac7761caf2c94da81.tar.gz
Mon Jan 14 10:45:45 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
* enc/ascii.c: Exchanged order of arguments for one ENC_ALIAS git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15031 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--enc/ascii.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index abdd3f9635..b2774bef1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jan 14 10:45:45 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
+
+ * enc/ascii.c: Exchanged order of arguments for one ENC_ALIAS
+
Mon Jan 14 09:19:07 2008 Tadayoshi Funaba <tadf@dotrb.org>
* lib/time.rb: do not reference Time directly from the inside of
diff --git a/enc/ascii.c b/enc/ascii.c
index 8caf4cf3bf..c52ebd03df 100644
--- a/enc/ascii.c
+++ b/enc/ascii.c
@@ -55,7 +55,7 @@ ENC_ALIAS("CP737", "IBM737");
ENC_REPLICATE("IBM775", "ASCII-8BIT");
ENC_ALIAS("CP775", "IBM775");
ENC_REPLICATE("CP850", "ASCII-8BIT");
-ENC_ALIAS("CP850", "IBM850");
+ENC_ALIAS("IBM850", "CP850");
ENC_REPLICATE("IBM852", "ASCII-8BIT");
ENC_REPLICATE("CP852", "IBM852");
ENC_REPLICATE("IBM855", "ASCII-8BIT");