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

* 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
comparison
equal deleted inserted replaced
138:fca2657f4aa5 246:eeebe205a056
63 UTF-16 63 UTF-16
64 UTF-16BE 64 UTF-16BE
65 UTF-16LE 65 UTF-16LE
66 EUC-JP 66 EUC-JP
67 Shift_JIS 67 Shift_JIS
68 CP932
68 GB18030 69 GB18030
69 GBK 70 GBK
70 ISCII91 71 ISCII91
71 EUC-KR 72 EUC-KR
72 Big5 73 Big5