]> git.parisson.com Git - pdf.js.git/commit
Merge remote-tracking branch 'mozilla/master' into convert-docinfo
authorYury Delendik <ydelendik@mozilla.com>
Thu, 5 Apr 2012 16:34:55 +0000 (11:34 -0500)
committerYury Delendik <ydelendik@mozilla.com>
Thu, 5 Apr 2012 16:34:55 +0000 (11:34 -0500)
commit5dd4c0278dc8b983bd31e2d762454b1d70c6bb04
tree2f49d817c3fe580a90d6f8b60d99558519fe7648
parent08a241fc4b0a919946fa2285f49b553bf2151c31
parent8c39a3edaad99e00790cba47031816b33a270fa8
Merge remote-tracking branch 'mozilla/master' into convert-docinfo

Conflicts:
src/core.js
src/core.js