]> git.parisson.com Git - pdf.js.git/commit
projects / pdf.js.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2248690 eb592e0)
Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into tree-22
authornotmasteryet <async.processingjs@yahoo.com>
Thu, 22 Sep 2011 01:00:35 +0000 (20:00 -0500)
committernotmasteryet <async.processingjs@yahoo.com>
Thu, 22 Sep 2011 01:00:35 +0000 (20:00 -0500)
commited21c8590caf378eeb5d4424973569a4987287e4
tree7dbbdf568da6e514ae68b365850727bcf91bb5d3tree | snapshot
parent2248690d110b48fd3d30ed235b405020351d27e3commit | diff
parenteb592e09e4372b06c25da53dc1450534ef84eea5commit | diff
Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into tree-22

Conflicts:
pdf.js
pdf.js diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.