[Pkg-javascript-commits] [pdf.js] 50/72: Merge pull request #5821 from Snuffleupagus/bug-1140761

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository pdf.js.

commit 70608be3516ffae6d3c663aa454cc93783f34087
Merge: c17ff30 4a9ff47
Author: Tim van der Meij <timvandermeij at gmail.com>
Date:   Wed Mar 11 13:46:15 2015 +0100

    Merge pull request #5821 from Snuffleupagus/bug-1140761
    
    Correctly detect the presence of the Adobe specific APP14 JPEG marker (bug 1140761)

 src/core/jpg.js               | 4 ++--
 test/pdfs/bug1140761.pdf.link | 1 +
 test/test_manifest.json       | 9 +++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/pdf.js.git