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

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

author	notmasteryet <async.processingjs@yahoo.com>
	Sun, 22 Jan 2012 19:56:56 +0000 (13:56 -0600)
committer	notmasteryet <async.processingjs@yahoo.com>
	Sun, 22 Jan 2012 19:56:56 +0000 (13:56 -0600)
commit	1ac24dbc015989fff82b1224ab587334c377608a
tree	ce7883a1c4351fad9e6717adddeb3765b3b6b60a	tree \| snapshot
parent	739f111ce1f64c3bda8f4b43c49c5b939e3807c9	commit \| diff
parent	36cf14b08cf3ce1fd4c2e73ff9f16c6b55c752f3	commit \| diff

Merge remote-tracking branch 'mozilla/master' into textsearch-1

Conflicts:
src/core.js
src/fonts.js

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