]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f82fc4 edb69df)
Merge remote branch 'upstream/master'
authorVivien Nicolas <21@vingtetun.org>
Wed, 22 Jun 2011 09:31:24 +0000 (11:31 +0200)
committerVivien Nicolas <21@vingtetun.org>
Wed, 22 Jun 2011 09:31:24 +0000 (11:31 +0200)
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.