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: 78cb1f0 8afd1a6)

author	sbarman <sbarman@L3CWZ5T.(none)>
	Mon, 20 Jun 2011 21:02:54 +0000 (14:02 -0700)
committer	sbarman <sbarman@L3CWZ5T.(none)>
	Mon, 20 Jun 2011 21:02:54 +0000 (14:02 -0700)
commit	48134150448561eb47852dbbf50831a8cfdff7ae
tree	4881ab62fff49942b0a0b58b55fda2772e20a5cd	tree \| snapshot
parent	78cb1f05b352fcbe91b348709b7f96d5191a83cd	commit \| diff
parent	8afd1a65ff1bb83fe22076f4be352c692a8e070a	commit \| diff

Merge branch 'master' into streamrewrite2

Conflicts:
pdf.js

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