git.parisson.com Git - pdf.js.git/commit

]> git.parisson.com Git - pdf.js.git/commit

author	Artur Adib <arturadib@gmail.com>
	Tue, 8 May 2012 21:22:48 +0000 (17:22 -0400)
committer	Artur Adib <arturadib@gmail.com>
	Tue, 8 May 2012 21:22:48 +0000 (17:22 -0400)
commit	2d3ed7fc7886b371525cba4a27c2c8e1f247fefd
tree	2c035edc5a9ff6f3fdf24c80fc767c8c5be2cb97	tree \| snapshot
parent	f8ed7bb31a821561aaaeee742b565c5c3b5c2e43	commit \| diff
parent	78c331034ea25fc7954bd4e3bcc786fe930b4603	commit \| diff

Merge branch 'refs/heads/master' into textsearch

Conflicts:
web/viewer.css
web/viewer.html
web/viewer.js

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