[Pkg-javascript-commits] [pdf.js] 121/204: Merge pull request #5314 from yurydelendik/issue5313

[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 678fb0ea9f656b7c9a45eea3d546231209501730
Merge: 942c838 dd48d1c
Author: Brendan Dahl <brendan.dahl at gmail.com>
Date:   Tue Sep 23 14:01:53 2014 -0700

    Merge pull request #5314 from yurydelendik/issue5313
    
    Fixes names collisions in content.js

 extensions/firefox/chrome/content.js | 133 ++++++++++++++++++-----------------
 1 file changed, 69 insertions(+), 64 deletions(-)

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