]> git.parisson.com Git - pdf.js.git/commitdiff
Merge branch 'master' of github.com:andreasgal/pdf.js into predictor
authorsbarman <sbarman@L3CWZ5T.(none)>
Sun, 25 Sep 2011 23:27:15 +0000 (16:27 -0700)
committersbarman <sbarman@L3CWZ5T.(none)>
Sun, 25 Sep 2011 23:27:15 +0000 (16:27 -0700)
1  2 
pdf.js

diff --cc pdf.js
Simple merge