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: 287e7a7 fa4c34a)

author	sbarman <sbarman@L3CWZ5T.(none)>
	Thu, 9 Jun 2011 21:59:15 +0000 (14:59 -0700)
committer	sbarman <sbarman@L3CWZ5T.(none)>
	Thu, 9 Jun 2011 21:59:15 +0000 (14:59 -0700)
commit	78493db4212fbb7b4aa2426bb51a0957d95140ea
tree	00b2f7732ece1d1c16bb7b5b20154f0e935afa22	tree \| snapshot
parent	287e7a702afc7e7d86ef99af1ce60ff2221eba17	commit \| diff
parent	fa4c34ad06050249dfb4e6c77bfa08062a1252f7	commit \| diff

Merge remote-tracking branch 'agal/master'

Conflicts:
pdf.js
test.html

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