]> git.parisson.com Git - pdf.js.git/commitdiff
projects / pdf.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91c9351 cf00831)
Merge remote-tracking branch 'upstream/master' into dev
authorKalervo Kujala <kkujala@com>
Tue, 10 Jan 2012 17:27:51 +0000 (19:27 +0200)
committerKalervo Kujala <kkujala@com>
Tue, 10 Jan 2012 17:27:51 +0000 (19:27 +0200)
Conflicts:
test/unit/unit_test.html


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