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

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

author	Artur Adib <arturadib@gmail.com>
	Mon, 28 Nov 2011 15:02:07 +0000 (10:02 -0500)
committer	Artur Adib <arturadib@gmail.com>
	Mon, 28 Nov 2011 15:02:07 +0000 (10:02 -0500)
commit	4cfc5521639397c9bf84ee66c3e1234aa49608fc
tree	5f5cd68c92887b2e8ed3a0c5675682e3884f6ddb	tree \| snapshot
parent	a1853185b16a69ac7eb8d22b3b276d467236c0aa	commit \| diff
parent	2e70984f38b16979fdb766afc6161be7c1c7797f	commit \| diff

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

Conflicts:
src/canvas.js
web/viewer.js

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