This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository pdf.js.
commit 05b9d3730a001d9ba440509e2cec5d8c7e2fada0
Merge: eb557d2 79c2f69
Author: Tim van der Meij <timvandermeij at gmail.com>
Date: Mon Dec 21 22:44:58 2015 +0100
Merge pull request #6785 from yurydelendik/frameworks
Adds/modifies examples for node.js and webpack.
examples/node/domstubs.js | 8 ++++++++
examples/node/getinfo.js | 8 +++-----
examples/node/pdf2svg.js | 8 ++------
examples/webpack/.gitignore | 1 +
examples/webpack/README.md | 18 +++++++++++++++++
examples/webpack/index.html | 11 +++++++++++
examples/webpack/main.js | 32 ++++++++++++++++++++++++++++++
examples/webpack/package.json | 9 +++++++++
examples/webpack/webpack.config.js | 20 +++++++++++++++++++
make.js | 2 ++
package.json | 1 +
src/core/worker.js | 5 +++--
src/display/api.js | 19 +++++++++++++++---
src/frameworks.js | 40 ++++++++++++++++++++++++++++++++++++++
src/pdf.js | 7 ++++---
15 files changed, 170 insertions(+), 19 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/pdf.js.git