Mercurial > hg > soundsoftware-site

diff app/models/.svn/text-base/setting.rb.svn-base @ 246:eeebe205a056 cannam

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Merge from default branch, bringing us up to SVN trunk rev 4993
author Chris Cannam
date Thu, 03 Mar 2011 12:02:03 +0000
parents 051f544170fe
children cbce1fd3b1b7
line wrap: on
line diff
--- a/app/models/.svn/text-base/setting.rb.svn-base	Thu Jan 20 09:59:02 2011 +0000
+++ b/app/models/.svn/text-base/setting.rb.svn-base	Thu Mar 03 12:02:03 2011 +0000
@@ -65,6 +65,7 @@
                   UTF-16LE
                   EUC-JP
                   Shift_JIS
+                  CP932
                   GB18030
                   GBK
                   ISCII91