diff options
| author | Stephen Blott | 2015-04-25 07:50:31 +0100 |
|---|---|---|
| committer | Stephen Blott | 2015-04-25 07:50:31 +0100 |
| commit | e7ae8e0cc5aa5d4a8c7778c4a2f88b53d7cc4111 (patch) | |
| tree | cd9396584b0433c686983af3cf8cc3026e2edf30 /lib | |
| parent | f85c65bb664fdc29b7c45c579ead4481238a24e0 (diff) | |
| parent | 8b7b4febdf8947b3a123e8dc2b289caa20976864 (diff) | |
| download | vimium-e7ae8e0cc5aa5d4a8c7778c4a2f88b53d7cc4111.tar.bz2 | |
Merge remote-tracking branch 'origin/focus-main-frame' into focus-main-frame-merge
Conflicts:
content_scripts/vimium_frontend.coffee
Also rework to remove dependency on Chrome 41+ sendMessage API
(specifically, relating to optional target frameId argument).
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions