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

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

author	notmasteryet <async.processingjs@yahoo.com>
	Sat, 31 Dec 2011 02:04:08 +0000 (20:04 -0600)
committer	notmasteryet <async.processingjs@yahoo.com>
	Sat, 31 Dec 2011 02:04:08 +0000 (20:04 -0600)
commit	7b479c352c6e283e17fd8cb2169160ee9b7a5669
tree	ad8e95e1005efab1d6bcb910e6fe09f6f85a45b0	tree \| snapshot
parent	5affc0d7946bc85c3bd87dc516cd68d89d562762	commit \| diff
parent	c0cf081ec0b7728c6a7ae2e2acf053e5debd75da	commit \| diff

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

Conflicts:
web/viewer.js

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