]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c21a95c b02b7be)
Merge branch 'master' of git://github.com/mozilla/pdf.js.git into update-md5-2
authorYury Delendik <ydelendik@mozilla.com>
Tue, 17 Apr 2012 21:54:09 +0000 (16:54 -0500)
committerYury Delendik <ydelendik@mozilla.com>
Tue, 17 Apr 2012 21:54:09 +0000 (16:54 -0500)
Conflicts:
test/test_manifest.json

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.