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: a8081e7 8705c34)

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	bc886362d4f0d87b6eeac48b9f1e8c21d499b395
tree	4881ab62fff49942b0a0b58b55fda2772e20a5cd	tree \| snapshot
parent	a8081e75e713a29b62da6f03e1b28147c15c985c	commit \| diff
parent	8705c341d6bf70c49cd756d12bc032ef23ab9a33	commit \| diff

Merge branch 'master' into streamrewrite2

Conflicts:
pdf.js

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