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: 678b7dc e9cd29c)

author	Kalervo Kujala <kkujala@com>
	Thu, 5 Jan 2012 19:16:15 +0000 (21:16 +0200)
committer	Kalervo Kujala <kkujala@com>
	Thu, 5 Jan 2012 19:16:15 +0000 (21:16 +0200)
commit	09eed8d9715f7ef569c3ca9b2d43f14a7d1f73f8
tree	bd964d9aaeb0dd9a9111614207a31f41d10558db	tree \| snapshot
parent	678b7dcd0484ee9a2d66c3546b87a6badc5bfe62	commit \| diff
parent	e9cd29cffeeb65fe4ac5e233235993c14e4351d0	commit \| diff

Merge remote-tracking branch 'upstream/master' into dev

Conflicts:
Makefile
test/unit/unit_test.html

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