Jakub Klinkovský 3265601eab Merge remote-tracking branch 'upstream/master' into hints_clicking ... * upstream/master: (327 commits) Remove unused import tox: Update Werkzeug to 0.11.8 Regenerate authors Use __file__ instead of sys.argv[0] Regenerate authors Make update_3rdparty.py install correctly when run from any directory Open command line urls explicitly. tox: Update Werkzeug to 0.11.6 Move qutebrowser.rcc to misc/ Regenerate resources Fix CHANGELOG/link in README New qutebrowser logo! www: Add releases link Release v0.6.1 release checklist: Clarify how to build on Windows Make sure the cheatsheet PNG is included in sdist Fix cheatsheet link URL in quickstart Mark segfault on exit in test_smoke as xfail Add a xfail test for #797 Add missing file ... Conflicts: tests/integration/features/hints.feature		2016-04-15 22:37:47 +02:00
..
html	hints: split tests into individual HTML files	2016-02-23 18:19:52 +01:00
iframe_scroll.html	hints: add xfailed tests for hinting inside iframes	2016-02-24 23:15:13 +01:00
iframe_target.html	hints: add another iframe test	2016-03-16 21:47:58 +01:00
iframe.html	hints: add xfailed tests for hinting inside iframes	2016-02-24 23:15:13 +01:00
link_blank.html	Add integration tests for current target hints	2016-03-30 19:49:25 +02:00
link_span.html	Add link_span.html	2016-03-31 09:36:13 +02:00