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

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

author	notmasteryet <async.processingjs@yahoo.com>
	Thu, 15 Dec 2011 01:37:21 +0000 (19:37 -0600)
committer	notmasteryet <async.processingjs@yahoo.com>
	Thu, 15 Dec 2011 01:37:21 +0000 (19:37 -0600)
commit	04551dbf578d599d22d2f54fe3bed3546126fcea
tree	c4eb11eaaedf8de8f28ff5254dfc36009f321fff	tree \| snapshot
parent	fb2d165a488e34a646412615a7cc2aa2e8e82af1	commit \| diff
parent	f8a38de791bc755c682dbc74b9da32a740cc970c	commit \| diff

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

Conflicts:
src/core.js

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