Merge from rev.7103:7118

diff --cc Src/DiffTextBuffer.cpp
Simple merge

diff --cc Src/Merge.rc
index de64922,efc7c5b..ecc0a72
--- 1/Src/Merge.rc
--- 2/Src/Merge.rc
+++ b/Src/Merge.rc
@@@ -1878,9 -1725,9 +1878,9 @@@ BEGI
              VALUE "Comments", "\0"
              VALUE "CompanyName", "http://winmerge.org\0"
              VALUE "FileDescription", "WinMerge Application\0"
 -            VALUE "FileVersion", "000.000.000.000\0"
 +            VALUE "FileVersion", STRFILEVER
              VALUE "InternalName", "WinMerge\0"
-             VALUE "LegalCopyright", "(c) 1996-2009 Dean P. Grimm / Thingamahoochie Software\0"
+             VALUE "LegalCopyright", "(c) 1996-2010 Dean P. Grimm / Thingamahoochie Software\0"
              VALUE "OriginalFilename", "WinMerge.EXE\0"
              VALUE "PrivateBuild", ""
              VALUE "ProductName", "WinMerge\0"

diff --cc Src/editlib/ccrystaltextbuffer.cpp
Simple merge

diff --cc Src/editlib/ccrystaltextbuffer.h
Simple merge

diff --cc Src/editlib/ccrystaltextview.cpp
Simple merge