]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 127a6e9 a018fe6)
Merge branch 'master' of github.com:andreasgal/pdf.js
authorChris Jones <jones.chris.g@gmail.com>
Mon, 9 May 2011 23:20:10 +0000 (18:20 -0500)
committerChris Jones <jones.chris.g@gmail.com>
Mon, 9 May 2011 23:20:10 +0000 (18:20 -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.