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
..
helpers	Fix lint	2016-03-29 23:20:39 +02:00
html	Add tests/html/jsalert_multiline.html.	2015-08-27 22:13:40 +02:00
integration	Merge remote-tracking branch 'upstream/master' into hints_clicking	2016-04-15 22:37:47 +02:00
unit	Release v0.6.1	2016-04-10 21:25:32 +02:00
conftest.py	Stop supporting running tests without Xvfb/DISPLAY	2016-04-06 08:27:43 +02:00
test_conftest.py	tests: Allow XPASS for test_installed_package	2016-03-02 08:09:04 +01:00