qutebrowser/test
Bruno Oliveira 4fa2294805 Merge remote-tracking branch 'origin/master' into layout
Conflicts:
	qutebrowser/test/keyinput/test_basekeyparser.py
	qutebrowser/test/utils/test_standarddir.py
	test/browser/http/test_content_disposition.py
	test/config/test_configtypes.py
	test/misc/test_editor.py
	test/utils/test_debug.py
	test/utils/test_utils.py
	tox.ini
2015-04-04 14:29:49 -03:00
..
browser Merge remote-tracking branch 'origin/master' into layout 2015-04-04 14:29:49 -03:00
config Merge remote-tracking branch 'origin/master' into layout 2015-04-04 14:29:49 -03:00
html Add jsconfirm.html test file. 2015-01-28 20:34:46 +01:00
keyinput Merge remote-tracking branch 'origin/master' into layout 2015-04-04 14:29:49 -03:00
mainwindow Moved tests to outside of qutebrowser package 2015-04-03 16:49:01 -03:00
misc Merge remote-tracking branch 'origin/master' into layout 2015-04-04 14:29:49 -03:00
utils Merge remote-tracking branch 'origin/master' into layout 2015-04-04 14:29:49 -03:00
conftest.py Converted test_basekeyparser to pytest 2015-04-04 12:37:14 -03:00
log.py Merge remote-tracking branch 'origin/master' into layout 2015-04-04 14:29:49 -03:00
stubs.py Converted test_editor to pytest 2015-04-04 13:29:11 -03:00
test_stubs.py Renamed singleShot to isSingleShot in QTimer stub 2015-04-04 12:52:49 -03:00