Merge remote-tracking branch 'origin/2.7'

Conflicts:
	doc/src/debugger/qtquick-debugger-example.qdoc

Change-Id: If9a6ac2db76773c50aae26c5156e6aa2603329b3

src/plugins/diffeditor/differ.cpp

@@ -27,6 +27,14 @@
 **
 ****************************************************************************/
 
+/*
+The main algorithm "diffMyers()" is based on "An O(ND) Difference Algorithm
+and Its Variations" by Eugene W. Myers: http://www.xmailserver.org/diff2.pdf
+
+Preprocessing and postprocessing functions inspired by "Diff Strategies"
+publication by Neil Fraser: http://neil.fraser.name/writing/diff/
+*/
+
 #include "differ.h"
 
 #include <QList>