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: a89bd1d 496a637)

author	sbarman <sbarman@L3CWZ5T.(none)>
	Thu, 9 Jun 2011 21:42:31 +0000 (14:42 -0700)
committer	sbarman <sbarman@L3CWZ5T.(none)>
	Thu, 9 Jun 2011 21:42:31 +0000 (14:42 -0700)
commit	c5a04b900f7d91ee3a4ae168317c74502831d5da
tree	08ee157525068edc2a76c040d02135587c1d60ee	tree \| snapshot
parent	a89bd1d30e4e594d6ee2cf95efb4cb3ff1eec2b2	commit \| diff
parent	496a6374c1ac04e4efbb872eb7213ea6e4c5ee69	commit \| diff

Merge commit '496a6374c1ac04e'

Conflicts:
pdf.js

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