[Pkg-javascript-commits] [pdf.js] 41/119: Merge pull request #5907 from timvandermeij/browser-manifests

[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 043456979811552efe10d71c616180d85ccf1d48
Merge: 32cc021 50573b8
Author: Jonas Jenwald <jonas.jenwald at gmail.com>
Date:   Sat Apr 4 12:18:09 2015 +0200

    Merge pull request #5907 from timvandermeij/browser-manifests
    
    Provide only one browser manifest example

 make.js                                                    | 10 +++++-----
 .../browser_manifests/browser_manifest.json.example        | 10 ++++++++++
 .../browser_manifests/browser_manifest.json.linux          | 10 ----------
 test/resources/browser_manifests/browser_manifest.json.mac | 14 --------------
 .../browser_manifests/browser_manifest.json.windows        | 10 ----------
 5 files changed, 15 insertions(+), 39 deletions(-)

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