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: 1bb4406 095137e)

author	sbarman <sbarman@L3CWZ5T.(none)>
	Tue, 28 Jun 2011 21:23:56 +0000 (14:23 -0700)
committer	sbarman <sbarman@L3CWZ5T.(none)>
	Tue, 28 Jun 2011 21:23:56 +0000 (14:23 -0700)
commit	5a1a35813bfa181e144b8499487bfbd32218c808
tree	21bfaf5780b4922db6e1e8c2d285cd944b022f76	tree \| snapshot
parent	1bb440670210c7e52413928e6c28b6220642db55	commit \| diff
parent	095137ece164378254e002db3da4a452104a8fd7	commit \| diff

Merge branch 'master' into colorspace

Conflicts:
pdf.js

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