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: efe148e f3fcbd0)

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	91601bf9be63191bac2adae1892c89c72a005033
tree	4458649dafd7a961c03c0361a569100247e6dddd	tree \| snapshot
parent	efe148e715f9f5d09ae6d04380ce5cc6f505b93e	commit \| diff
parent	f3fcbd0fbc233abf238e39a53bc2f13a905e91b3	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.