]> git.parisson.com Git - pdf.js.git/commit
Merge branch 'master' of github.com:sbarman/pdf.js
authorsbarman <sbarman@L3CWZ5T.(none)>
Thu, 21 Jul 2011 18:27:25 +0000 (11:27 -0700)
committersbarman <sbarman@L3CWZ5T.(none)>
Thu, 21 Jul 2011 18:27:25 +0000 (11:27 -0700)
commita821129322e3d4717b0bd66acbfc91dd16ee667b
treee4e24a2ee74ac5c201fcd83e2a6fc39870fdc7d1
parentc184ad9c4076eb361874453a5113cbfcb6927b58
parent645c9acb62313cab8e45ccdf4dc68b035ffffdd8
Merge branch 'master' of github.com:sbarman/pdf.js

Conflicts:
pdf.js