Merge branch 'master' of https://github.com/error800/qutebrowser into error800-master

This commit is contained in:
Florian Bruhin 2015-03-11 21:49:27 +01:00
commit fb85a279f4

View File

@ -654,14 +654,7 @@ DATA = collections.OrderedDict([
('searchengines', sect.ValueList(
typ.SearchEngineName(), typ.SearchEngineUrl(),
('DEFAULT', '${duckduckgo}'),
('duckduckgo', 'https://duckduckgo.com/?q={}'),
('ddg', '${duckduckgo}'),
('google', 'https://encrypted.google.com/search?q={}'),
('g', '${google}'),
('wikipedia', 'http://en.wikipedia.org/w/index.php?'
'title=Special:Search&search={}'),
('wiki', '${wikipedia}'),
('DEFAULT', 'https://duckduckgo.com/?q={}'),
)),
('aliases', sect.ValueList(