Merge pull request #466 from notmasteryet/charstoglyphs

author vingtetun <21@vingtetun.org>

Mon, 19 Sep 2011 14:34:46 +0000 (07:34 -0700)

committer vingtetun <21@vingtetun.org>

Mon, 19 Sep 2011 14:34:46 +0000 (07:34 -0700)
author vingtetun <21@vingtetun.org>
Mon, 19 Sep 2011 14:34:46 +0000 (07:34 -0700)
committer vingtetun <21@vingtetun.org>
Mon, 19 Sep 2011 14:34:46 +0000 (07:34 -0700)
diff --cc fonts.js
Simple merge
diff --cc pdf.js
Simple merge
author	vingtetun <21@vingtetun.org>
	Mon, 19 Sep 2011 14:34:46 +0000 (07:34 -0700)
committer	vingtetun <21@vingtetun.org>
	Mon, 19 Sep 2011 14:34:46 +0000 (07:34 -0700)
		1	2
fonts.js	patch \|	diff1 \|	diff2 \|	blob \| history
pdf.js	patch \|	diff1 \|	diff2 \|	blob \| history