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: 72d8bf4 a6c48e3)

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	50bf57e353108b90aba50e893c28c47e278ce751
tree	54199f178a25f79b3f82c2e63e975c418d2b24d6	tree \| snapshot
parent	72d8bf4fdaa5893e6ab6e9f6a9bb5a27c6aa7423	commit \| diff
parent	a6c48e3bc2abc0a6ed274d1f7b1014bc12fd4f0d	commit \| diff

Merge branch 'master' into predictor

Conflicts:
pdf.js

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