]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3bde084 eaba65b)
Merge branch 'master' of git://github.com/mozilla/pdf.js.git into textsearch-1
authornotmasteryet <async.processingjs@yahoo.com>
Tue, 20 Dec 2011 00:06:31 +0000 (18:06 -0600)
committernotmasteryet <async.processingjs@yahoo.com>
Tue, 20 Dec 2011 00:06:31 +0000 (18:06 -0600)
1  2 
src/evaluator.js patch | diff1 | diff2 | blob | history
web/viewer.js patch | diff1 | diff2 | blob | history

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