diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-03-18 10:19:14 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-03-18 10:19:14 +0100 |
| commit | 99b2eb1ca9f0515681bf949db0ab6650f857e82b (patch) | |
| tree | 730a84b76b55e623ec331940631e247f55cc39df /src/plugins/diffeditor | |
| parent | 7a107e7d004610ee8332b122aeb8993e61056b23 (diff) | |
| parent | e1aa32225865980992e79c53fdf3b40e0fcd0a86 (diff) | |
| download | qt-creator-99b2eb1ca9f0515681bf949db0ab6650f857e82b.tar.gz | |
Merge remote-tracking branch 'origin/2.7'
Conflicts:
doc/src/debugger/qtquick-debugger-example.qdoc
Change-Id: If9a6ac2db76773c50aae26c5156e6aa2603329b3
Diffstat (limited to 'src/plugins/diffeditor')
| -rw-r--r-- | src/plugins/diffeditor/differ.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/diffeditor/differ.cpp b/src/plugins/diffeditor/differ.cpp index 23d2784908..5a30d9fe5b 100644 --- a/src/plugins/diffeditor/differ.cpp +++ b/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> |