From 47b0b5e410785e29f83a8eb93da6431a4f505e01 Mon Sep 17 00:00:00 2001
From: "yokoyama%netscape.com"
 <yokoyama%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 29 Nov 2001 00:24:13 +0000
Subject: [PATCH] Bug 112240 Add shift-jis alias in a properties file
 /r=shanjian

git-svn-id: svn://10.0.0.236/trunk@109153 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/intl/uconv/src/charsetalias.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mozilla/intl/uconv/src/charsetalias.properties b/mozilla/intl/uconv/src/charsetalias.properties
index 2c2f820e1ff..e20e618386b 100644
--- a/mozilla/intl/uconv/src/charsetalias.properties
+++ b/mozilla/intl/uconv/src/charsetalias.properties
@@ -268,6 +268,7 @@ unicode-1-1-utf-8=UTF-8
 ## Aliases for Shift_JIS
 ##
 x-sjis=Shift_JIS
+shift-jis=Shift_JIS
 ms_kanji=Shift_JIS
 csshiftjis=Shift_JIS
 windows-31j=Shift_JIS