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: 07f8145 2a1fd97)

author	sbarman <sbarman@L3CWZ5T.(none)>
	Mon, 11 Jul 2011 16:25:22 +0000 (09:25 -0700)
committer	sbarman <sbarman@L3CWZ5T.(none)>
	Mon, 11 Jul 2011 16:25:22 +0000 (09:25 -0700)
commit	4861a9175dbf696065f851ffe195b6e4af4d36c8
tree	5e1b9b04b63d570ad7bef5860e9f5db3e682b4e0	tree \| snapshot
parent	07f814516527b1c8f654c69ba44d50e691e06516	commit \| diff
parent	2a1fd975ff227a5842f28bcefe7cb73ba62419c6	commit \| diff

Merge branch 'master' into shading

Conflicts:
pdf.js

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