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: 6c8e545 2e29244)

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	1ea51ed62db1dbeb23a712a3015e9ffdb05194c8
tree	a7b945f7384960e17f73df2cf68bfe4d6874e78c	tree \| snapshot
parent	6c8e545e5efc4830d22429603ad59b62b0f68a72	commit \| diff
parent	2e2924430acc097351e2843c00184519aaaa7c68	commit \| diff

Merge branch 'master' into faxstream

Conflicts:
pdf.js

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