]> git.parisson.com Git - pdf.js.git/commit
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)
commit0c50d14f387d08a4115f8cfabc50e4738a8ef369
tree8a1db89dedc3caecdfd2d8213f8e446f0ada2b49
parent91c935180ed4a2f116e67d38645fa4e9a6c79df9
parentcf00831a00aa1eebd1aae180f92e841b5b08d2ad
Merge remote-tracking branch 'upstream/master' into dev

Conflicts:
test/unit/unit_test.html