]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5b6c06d a908827)
Merge branch 'master' of git://github.com/mozilla/pdf.js.git into jpx6
authornotmasteryet <async.processingjs@yahoo.com>
Sat, 14 Jan 2012 00:24:31 +0000 (18:24 -0600)
committernotmasteryet <async.processingjs@yahoo.com>
Sat, 14 Jan 2012 00:24:31 +0000 (18:24 -0600)
1  2 
test/test_manifest.json patch | diff1 | diff2 | blob | history

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