]> git.parisson.com Git - pdf.js.git/commit
projects / pdf.js.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d30fac0 8505591)
Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into zoom-bookmark
authornotmasteryet <async.processingjs@yahoo.com>
Mon, 5 Sep 2011 20:54:54 +0000 (15:54 -0500)
committernotmasteryet <async.processingjs@yahoo.com>
Mon, 5 Sep 2011 20:54:54 +0000 (15:54 -0500)
commit9eac2e1c95217106c14d9d9f3aa88bc76ec71463
treec5b6846fc141df173122c8641da3d1df900a5afctree | snapshot
parentd30fac043856baa207f2786a971f9f63fe990450commit | diff
parent8505591c59baf776ba25504ad68765cd4ead1a72commit | diff
Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into zoom-bookmark

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