]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c184ad9 645c9ac)
Merge branch 'master' of github.com:sbarman/pdf.js
authorsbarman <sbarman@L3CWZ5T.(none)>
Thu, 21 Jul 2011 18:27:25 +0000 (11:27 -0700)
committersbarman <sbarman@L3CWZ5T.(none)>
Thu, 21 Jul 2011 18:27:25 +0000 (11:27 -0700)
Conflicts:
pdf.js


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