]> git.parisson.com Git - pdf.js.git/commit
Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into cid0
authornotmasteryet <async.processingjs@yahoo.com>
Thu, 29 Sep 2011 01:55:06 +0000 (20:55 -0500)
committernotmasteryet <async.processingjs@yahoo.com>
Thu, 29 Sep 2011 01:55:06 +0000 (20:55 -0500)
commit078433fecd61f270530bcd71818f104332b7f698
tree898e960e032b041c5d952692c4a6a7099ec544a2
parent66cd79f3083968c42e0747c5a832aa0cd9067202
parentf1fc5ab84d9ae1f152ec1f724204f6abf6dfb45b
Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into cid0

Conflicts:
pdf.js
fonts.js
pdf.js