]> git.parisson.com Git - pdf.js.git/commit
Merge branch 'master' of github.com:andreasgal/pdf.js
authorsbarman <sbarman@L3CWZ5T.(none)>
Wed, 15 Jun 2011 19:37:05 +0000 (12:37 -0700)
committersbarman <sbarman@L3CWZ5T.(none)>
Wed, 15 Jun 2011 19:37:05 +0000 (12:37 -0700)
commit23aba03f4351c76a68e3f742c553e81834e72cb6
treed41c3cf71b753dad93f9b183dd854e797d14fe1c
parent0f2d4c7011d605620bbcea543ec6f66004ff89c0
parent6a9f7def456c1ef528d3180de9df2884988dff23
Merge branch 'master' of github.com:andreasgal/pdf.js

Conflicts:
pdf.js
pdf.js