Liang Qi e918334045 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/widgets/dialogs/qcolordialog.cpp src/widgets/dialogs/qfiledialog.cpp tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp Change-Id: I34bc8a990f8f526889a95a5c7099ef557b9681ad		2016-09-28 11:51:35 +02:00
..
images	Purge sRGB chunks from PNGs in tests.	2016-03-29 08:39:43 +00:00
scripts	Fixup for text labels in lancelot graphics test	2016-03-31 10:27:39 +00:00
.gitignore	Moved integrationtests/* into other/	2011-11-30 09:30:22 +01:00
images.qrc	Moved integrationtests/* into other/	2011-11-30 09:30:22 +01:00
lancelot.pro	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-18 11:07:51 +02:00
paintcommands.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
paintcommands.h	Updated license headers	2016-01-21 18:55:18 +00:00
tst_lancelot.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-09-28 11:51:35 +02:00