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: 0bde1a3 28eba6d)

author	sbarman <sbarman@L3CWZ5T.(none)>
	Tue, 21 Jun 2011 00:51:38 +0000 (17:51 -0700)
committer	sbarman <sbarman@L3CWZ5T.(none)>
	Tue, 21 Jun 2011 00:51:38 +0000 (17:51 -0700)
commit	ce9229c113eb06b59c2d548f50a147b2c742f05d
tree	54199f178a25f79b3f82c2e63e975c418d2b24d6	tree \| snapshot
parent	0bde1a3fa224b4cd5cfc9627bb7bcf33cb08e4fa	commit \| diff
parent	28eba6d10e6fd8002ecce72be9c5efb969da47e6	commit \| diff

Merge branch 'master' into predictor

Conflicts:
pdf.js

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