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

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

author	Yury Delendik <ydelendik@mozilla.com>
	Thu, 5 Apr 2012 15:03:49 +0000 (10:03 -0500)
committer	Yury Delendik <ydelendik@mozilla.com>
	Thu, 5 Apr 2012 15:03:49 +0000 (10:03 -0500)
commit	cea388201de63e5613a48dd36220968abcaec457
tree	dacbdd56944cf8d040f3b1a0003d21b03560683a	tree \| snapshot
parent	cee2f73ca94f5a04a221903af56a6ea60b2e5ece	commit \| diff
parent	1a067ccf40ada13f74dfe8eb8465635c732eda1c	commit \| diff

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

Conflicts:
src/core.js
src/evaluator.js
src/obj.js

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