Merge branch 'master' of github.com:ming300/lunr.js

ming300 · ming300 · commit 16aa753efee6 · 2014-06-30T13:48:55.000+08:00
Conflicts:
	lunr.js
diff --git a/lunr.js b/lunr.js
@@ -1663,7 +1663,7 @@ lunr.trimmer = function (token) {
 }
 
 /**
-*check it contains Chinese (including Japanese and Korean)
+**check it contains Chinese (including Japanese and Korean)
 */
 function isChineseChar(str){     
    var reg = /[\u4E00-\u9FA5\uF900-\uFA2D]/;  

Original file line number	Diff line number	Diff line change
`@@ -1663,7 +1663,7 @@ lunr.trimmer = function (token) {`
`1663`	`1663`	`}`
`1664`	`1664`
`1665`	`1665`	`/**`
`1666`		`-*check it contains Chinese (including Japanese and Korean)`
	`1666`	`+**check it contains Chinese (including Japanese and Korean)`
`1667`	`1667`	`*/`
`1668`	`1668`	`function isChineseChar(str){`
`1669`	`1669`	`var reg = /[\u4E00-\u9FA5\uF900-\uFA2D]/;`