]> git.parisson.com Git - pdf.js.git/commit
Merge remote branch 'upstream/master'
authorVivien Nicolas <21@vingtetun.org>
Tue, 23 Aug 2011 14:40:49 +0000 (16:40 +0200)
committerVivien Nicolas <21@vingtetun.org>
Tue, 23 Aug 2011 14:40:49 +0000 (16:40 +0200)
commit62e7d2f608180b9f2d4b9d538ec50ca15a989afd
treeb5b32c28a09db50ba1b7fbaeee31ac6cf7af650c
parentbf86d1bec855bfab88939979792914945f4e62dd
parent52b67e7850ea3551acb122ce6c3c04676606d6ae
Merge remote branch 'upstream/master'

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