Merge branch 'master' of https://github.com/mozilla/pdf.js into amowarnings

author Brendan Dahl <brendan.dahl@gmail.com>

Wed, 1 Feb 2012 01:53:54 +0000 (17:53 -0800)

committer Brendan Dahl <brendan.dahl@gmail.com>

Wed, 1 Feb 2012 01:53:54 +0000 (17:53 -0800)
author Brendan Dahl <brendan.dahl@gmail.com>
Wed, 1 Feb 2012 01:53:54 +0000 (17:53 -0800)
committer Brendan Dahl <brendan.dahl@gmail.com>
Wed, 1 Feb 2012 01:53:54 +0000 (17:53 -0800)
diff --cc Makefile
Simple merge
diff --cc src/core.js
Simple merge
diff --cc web/viewer.html
Simple merge
diff --cc web/viewer.js
Simple merge
author	Brendan Dahl <brendan.dahl@gmail.com>
	Wed, 1 Feb 2012 01:53:54 +0000 (17:53 -0800)
committer	Brendan Dahl <brendan.dahl@gmail.com>
	Wed, 1 Feb 2012 01:53:54 +0000 (17:53 -0800)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
src/core.js	patch \|	diff1 \|	diff2 \|	blob \| history
web/viewer.html	patch \|	diff1 \|	diff2 \|	blob \| history
web/viewer.js	patch \|	diff1 \|	diff2 \|	blob \| history