]> git.parisson.com Git - pdf.js.git/commit
Merge branch 'refs/heads/master' into fix-worker-loader
authorArtur Adib <arturadib@gmail.com>
Wed, 11 Jan 2012 16:47:41 +0000 (11:47 -0500)
committerArtur Adib <arturadib@gmail.com>
Wed, 11 Jan 2012 16:47:41 +0000 (11:47 -0500)
commit7611a766c7ba185f4da46de427ffe368911414ff
treec647e3f4ee8a9a5a7c0aa800fb836490761be4e9
parentb2791c60a6c00506b179fa9713bf48a8539b27ef
parentec030c06c4936fdf53d068dd174e811d4f295e36
Merge branch 'refs/heads/master' into fix-worker-loader

Conflicts:
src/core.js
src/core.js