]> git.parisson.com Git - pdf.js.git/commit
Merge branch 'refs/heads/master' into localStorage-fix
authorArtur Adib <arturadib@gmail.com>
Wed, 1 Feb 2012 17:08:40 +0000 (12:08 -0500)
committerArtur Adib <arturadib@gmail.com>
Wed, 1 Feb 2012 17:08:40 +0000 (12:08 -0500)
commit6aa02d286ec9a549cee99e10c555cc7277f8c5f8
tree384b1911d1818c3b94bcde7c12097cc1105460be
parent843830cea0be94083f66bf65f525d66fe097fa61
parentff01faa86fa74673ae20fb61951ba28578711b94
Merge branch 'refs/heads/master' into localStorage-fix

Conflicts:
web/viewer.js
web/viewer.js