]> git.parisson.com Git - pdf.js.git/commitdiff
Merge branch 'api' of git://github.com/mozilla/pdf.js.git into remove-rotatept
authorYury Delendik <ydelendik@mozilla.com>
Wed, 11 Apr 2012 15:30:24 +0000 (08:30 -0700)
committerYury Delendik <ydelendik@mozilla.com>
Wed, 11 Apr 2012 15:30:24 +0000 (08:30 -0700)
1  2 
src/api.js

diff --cc src/api.js
Simple merge