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: 96e82da be6347c)

author	sbarman <sbarman@L3CWZ5T.(none)>
	Mon, 20 Jun 2011 21:16:09 +0000 (14:16 -0700)
committer	sbarman <sbarman@L3CWZ5T.(none)>
	Mon, 20 Jun 2011 21:16:09 +0000 (14:16 -0700)
commit	e70d4a2025eb4f2da8dd0b04cb2a86198373e8bf
tree	4458649dafd7a961c03c0361a569100247e6dddd	tree \| snapshot
parent	96e82daf16f5491cfa02b6591db2c9bccb9b885f	commit \| diff
parent	be6347c28d1446ae93b3a9feac68c403a397f493	commit \| diff

Merge branch 'master' of github.com:andreasgal/pdf.js into streamrewrite2

Conflicts:
pdf.js

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