]> git.parisson.com Git - pdf.js.git/commitdiff
Merge branch 'master' of git://github.com/mozilla/pdf.js.git into textsearch-1
authornotmasteryet <async.processingjs@yahoo.com>
Sun, 1 Jan 2012 19:13:16 +0000 (13:13 -0600)
committernotmasteryet <async.processingjs@yahoo.com>
Sun, 1 Jan 2012 19:13:16 +0000 (13:13 -0600)
1  2 
src/core.js

diff --cc src/core.js
Simple merge