]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19c0c6a e1b4fc5)
Merge remote-tracking branch 'upstream/api' into api
authorBrendan Dahl <brendan.dahl@gmail.com>
Fri, 13 Apr 2012 21:20:32 +0000 (14:20 -0700)
committerBrendan Dahl <brendan.dahl@gmail.com>
Fri, 13 Apr 2012 21:20:32 +0000 (14:20 -0700)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.