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: ab6ff77 e99dad9)

author	sbarman <sbarman@L3CWZ5T.(none)>
	Mon, 20 Jun 2011 21:56:34 +0000 (14:56 -0700)
committer	sbarman <sbarman@L3CWZ5T.(none)>
	Mon, 20 Jun 2011 21:56:34 +0000 (14:56 -0700)
commit	eaf4262133a9425ac5099979ce4c1872e8f7d3e3
tree	e5af65a05b954cc5177030cd8a512a1014de0efe	tree \| snapshot
parent	ab6ff77b41a463f89507018ad4ddf3eacc18e93b	commit \| diff
parent	e99dad9b081590d52126abd0de8a7cc867578c3c	commit \| diff

Merge branch 'master' into predictor

Conflicts:
pdf.js

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