]> git.parisson.com Git - pdf.js.git/commit
Merge branch 'master' of github.com:andreasgal/pdf.js
authorsbarman <sbarman@L3CWZ5T.(none)>
Wed, 15 Jun 2011 19:37:05 +0000 (12:37 -0700)
committersbarman <sbarman@L3CWZ5T.(none)>
Wed, 15 Jun 2011 19:37:05 +0000 (12:37 -0700)
commit7077ad5b672f0ef3356b911640c96868b2272a3a
treed41c3cf71b753dad93f9b183dd854e797d14fe1c
parenta0375c0f0b853b1ac8e609d20519b71a935a7a56
parent815544ab814eb1c659cab1e9cdc082ae1b6ce37e
Merge branch 'master' of github.com:andreasgal/pdf.js

Conflicts:
pdf.js
pdf.js