]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 22538d6 7b931b3)
Merge remote branch 'upstream/master'
authorRob Sayre <sayrer@gmail.com>
Sat, 25 Jun 2011 16:47:37 +0000 (09:47 -0700)
committerRob Sayre <sayrer@gmail.com>
Sat, 25 Jun 2011 16:47:37 +0000 (09:47 -0700)
1  2 
test/test_slave.html patch | diff1 | diff2 | blob | history

diff --cc test/test_slave.html
Simple merge
Unnamed repository; edit this file 'description' to name the repository.