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

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

author	Artur Adib <arturadib@gmail.com>
	Tue, 31 Jan 2012 18:20:05 +0000 (13:20 -0500)
committer	Artur Adib <arturadib@gmail.com>
	Tue, 31 Jan 2012 18:20:05 +0000 (13:20 -0500)
commit	7873ec966bb6ef717efd4e7a71abbdfc9aa998c7
tree	35422b67aacff41f98b63699423aa0264fd58bc0	tree \| snapshot
parent	30a01c5da6eeef910228c234619a26fdaf99f524	commit \| diff
parent	2047fba8cbd677ae0db324c1e27b39b76b07bcf2	commit \| diff

Merge branch 'refs/heads/master' into issue-1049

Conflicts:
src/canvas.js

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