git.parisson.com Git - pdf.js.git/commit

]> git.parisson.com Git - pdf.js.git/commit

author	notmasteryet <async.processingjs@yahoo.com>
	Sat, 12 Nov 2011 17:09:19 +0000 (11:09 -0600)
committer	notmasteryet <async.processingjs@yahoo.com>
	Sat, 12 Nov 2011 17:09:19 +0000 (11:09 -0600)
commit	60744a8a61a61f53f2f6d67d19a17580eb23b618
tree	a8e0a489b5cdbe4b514afce30ae0fb08c0a626d9	tree \| snapshot
parent	5d347b0ddbbc4c7731798402bade6a65ef64f929	commit \| diff
parent	aee1ccf39442687578fe81dc1cdf29f9e9459d13	commit \| diff

Merge branch 'master' of git://github.com/mozilla/pdf.js.git into encoding-2

Conflicts:
src/evaluator.js
src/fonts.js

Unnamed repository; edit this file 'description' to name the repository.