]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c819269 dba1a7d)
Merge branch 'master' into disable-textlayer-opt
authorArtur Adib <arturadib@gmail.com>
Wed, 4 Jan 2012 20:54:52 +0000 (15:54 -0500)
committerArtur Adib <arturadib@gmail.com>
Wed, 4 Jan 2012 20:54:52 +0000 (15:54 -0500)
1  2 
web/viewer.js patch | diff1 | diff2 | blob | history

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