]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1e735c 4281c02)
Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into aes-crypto
authornotmasteryet <async.processingjs@yahoo.com>
Thu, 21 Jul 2011 04:08:28 +0000 (23:08 -0500)
committernotmasteryet <async.processingjs@yahoo.com>
Thu, 21 Jul 2011 04:08:28 +0000 (23:08 -0500)
1  2 
pdf.js patch | diff1 | diff2 | blob | history

diff --cc pdf.js
Simple merge
Unnamed repository; edit this file 'description' to name the repository.