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

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

projects / pdf.js.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 46a17a2 adaa483)

author	sbarman <sbarman@L3CWZ5T.(none)>
	Fri, 24 Jun 2011 15:01:55 +0000 (08:01 -0700)
committer	sbarman <sbarman@L3CWZ5T.(none)>
	Fri, 24 Jun 2011 15:01:55 +0000 (08:01 -0700)
commit	1bcb3a39fa8139b4602e3a96f6c59f66b1ff4951
tree	a7b945f7384960e17f73df2cf68bfe4d6874e78c	tree \| snapshot
parent	46a17a2deb4e9e73f20e3fd30c70492482106441	commit \| diff
parent	adaa483f0a638ffd407401502d41bdf81621142c	commit \| diff

Merge branch 'master' into faxstream

Conflicts:
pdf.js

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