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: 609230a c15afab)

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	d8ef3cabcb9e6cd72b386841be42a1248c3de0b7
tree	e5af65a05b954cc5177030cd8a512a1014de0efe	tree \| snapshot
parent	609230ad07a155aee61f6583ca7d30bc9f2e75ac	commit \| diff
parent	c15afaba8bbedceb415ca63cae69f70a91cca406	commit \| diff

Merge branch 'master' into predictor

Conflicts:
pdf.js

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