[Winmerge-svn] SF.net SVN: winmerge: [4647] trunk
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ge...@us...> - 2007-10-18 19:35:39
|
Revision: 4647 http://winmerge.svn.sourceforge.net/winmerge/?rev=4647&view=rev Author: gerundt Date: 2007-10-18 12:35:37 -0700 (Thu, 18 Oct 2007) Log Message: ----------- BUG: [ 1807895 ] Text Color of Ignored Text Modified Paths: -------------- trunk/Docs/Users/ChangeLog.txt trunk/Src/MergeEditView.cpp Modified: trunk/Docs/Users/ChangeLog.txt =================================================================== --- trunk/Docs/Users/ChangeLog.txt 2007-10-18 18:39:28 UTC (rev 4646) +++ trunk/Docs/Users/ChangeLog.txt 2007-10-18 19:35:37 UTC (rev 4647) @@ -10,6 +10,7 @@ differences (#1811745) Bugfix: Don't clear selection when right-clicking outside it (#1814184) Bugfix: Configuration log labeled Vista as Longhorn (#1815859) + Bugfix: Customized text color for ignored differences didn't shown (#1807895) Translation updates: - Chinese Traditional (#1810192, #1810541) - Italian (#1805044) Modified: trunk/Src/MergeEditView.cpp =================================================================== --- trunk/Src/MergeEditView.cpp 2007-10-18 18:39:28 UTC (rev 4646) +++ trunk/Src/MergeEditView.cpp 2007-10-18 19:35:37 UTC (rev 4647) @@ -468,6 +468,7 @@ crBkgnd = m_cachedColors.clrTrivialDeleted; else crBkgnd = m_cachedColors.clrTrivial; + crText = m_cachedColors.clrTrivialText; return; } else if (dwLineFlags & LF_GHOST) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |