Florian Bruhin f6a0500bd3 Merge branch 'master' into new-config ... This pulls the travis changes to drop the old Qt 5.2 environment.		2017-09-11 18:39:41 +02:00
..
end2end	Merge branch 'master' into new-config	2017-09-11 18:39:41 +02:00
helpers	Fix completion tests after config merge.	2017-08-20 21:12:38 -04:00
manual	Update some more references to old config options	2017-07-04 16:46:02 +02:00
unit	Merge branch 'master' into new-config	2017-09-11 18:39:41 +02:00
conftest.py	Merge remote-tracking branch 'upstream/master' into HEAD	2017-08-06 18:13:49 -04:00
test_conftest.py	Finally update copyrights...	2017-05-09 21:37:03 +02:00