Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Xavier Fung 2012-09-11 10:09:44 +08:00
commit 90b285652d

View File

@ -35,7 +35,9 @@ var RenderingStates = {
FINISHED: 3 FINISHED: 3
}; };
PDFJS.workerSrc = '../build/pdf.js'; //#if (GENERIC || CHROME)
//PDFJS.workerSrc = '../build/pdf.js';
//#endif
var mozL10n = document.mozL10n || document.webL10n; var mozL10n = document.mozL10n || document.webL10n;