re-enabled plugin options
reconnecting the last of the config options
Merge pull request #1 from r3b/flash

Adding NPAPI support back in
removing dependencies that had been erroneously re-introduced
removing '=yes'
Merge branch 'master' of github.com:ariya/phantomjs
glib and gstreamer are needed for the plugin to be visible in page.render
Merge pull request #2 from r3b/flash

glib and gstreamer are needed for the plugin to be visible in page.rende...
trying out travis ci
Runner for jasmine 2

The old script needed some updates in order to support the new jasmine lib
Adding "test/ghostdriver-test" to run in Travis CI

Related to issue #11880
Making GhostDriver test "quiet-er" (and parallel)

Also, trying to get the exit status of those tests reported, in case they fail.

Related to #11952.
Run PhantomJS's tests as part of TravisCI

Related to #11952.
Fixed tests that dealt with manipulating request URLs.

Related to #11952.

Those tests use "http://phantomjs.org" as fixture.
The website "/images" directory has been renamed "/img",
breaking the tests.

Maybe not the greatest way to go about it, but
for now it will do. We probably need to have fixtures
served by a local server.
Changing Travis CI build list into a table
Update example

Since this example was written the phantomjs home page has been redesigned and the targeted ID no longer exists. This tweaks the example so that it can again find content to report.
Merge branch 'master' of https://github.com/pauloalem/phantomjs into pauloalem-master
Fix harfbuzz assertions using patch from Chromium.

Exotic text (e.g. attempting to render a binary file such as .zip
or .exe as a webpage) can trigger an assertion failure in the
Harfbuzz code. Chromium developers also noticed this issue and
committed a patch to fix it:

http://lists.freedesktop.org/archives/harfbuzz/2009-August/000354.html

This patch has not been accepted by upstream, but this (old) version
of Harfbuzz has been abandoned and superceded by Harfbuzz-NG.

Issue #11264
Use SVG version of travis build status badges

https://github.com/ariya/phantomjs/issues/11880
Added setProxy function

https://github.com/ariya/phantomjs/issues/10803