]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1aa0b39 67baa86)
Resolve merge conflict in test_slave.html.
authorRob Sayre <sayrer@gmail.com>
Mon, 4 Jul 2011 21:48:13 +0000 (14:48 -0700)
committerRob Sayre <sayrer@gmail.com>
Mon, 4 Jul 2011 21:48:13 +0000 (14:48 -0700)

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