[Winmerge-svn] SF.net SVN: winmerge: [3886] branches/R2_6
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <sdo...@us...> - 2006-12-02 13:18:23
|
Revision: 3886 http://svn.sourceforge.net/winmerge/?rev=3886&view=rev Author: sdottaka Date: 2006-12-02 05:18:21 -0800 (Sat, 02 Dec 2006) Log Message: ----------- BUG: [ 1603077 ] Doesn't filter the file vc60.idb using "Merge_VC_loose.flt" Modified Paths: -------------- branches/R2_6/Filters/Merge_VC_loose.flt branches/R2_6/Src/Changes.txt Modified: branches/R2_6/Filters/Merge_VC_loose.flt =================================================================== --- branches/R2_6/Filters/Merge_VC_loose.flt 2006-12-02 13:17:50 UTC (rev 3885) +++ branches/R2_6/Filters/Merge_VC_loose.flt 2006-12-02 13:18:21 UTC (rev 3886) @@ -17,7 +17,7 @@ f: \.dll$ ## Windows DLL f: \.exe$ ## Windows/DOS executable f: \.exp$ ## VC library export file -f: \\vc60.idb$ ## VC ? +f: ^vc[4-9]0\.idb$ ## VC Minimal rebuild dependency file f: \.ilk$ ## VC incremental linker memory file f: \.lib$ ## compiled libraries f: \.ncb$ ## VC parser information file (class view & component gallery stuff) Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2006-12-02 13:17:50 UTC (rev 3885) +++ branches/R2_6/Src/Changes.txt 2006-12-02 13:18:21 UTC (rev 3886) @@ -3,6 +3,10 @@ (This summarizes all changes to all files under Src, including Src\Languages.) 2006-12-02 Takashi + BUG: [ 1603077 ] Doesn't filter the file vc60.idb using "Merge_VC_loose.flt" + Filters: Merge_VC_loose.flt + +2006-12-02 Takashi BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly Src: DirActions.cpp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |