OSDN Git Service
(root)
/
winmerge-jp
/
winmerge-jp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f8a7a55
)
Update Merge_FC_loose.flt for VS2010
author
sdottaka
<none@none>
Sat, 28 Sep 2013 01:33:35 +0000
(10:33 +0900)
committer
sdottaka
<none@none>
Sat, 28 Sep 2013 01:33:35 +0000
(10:33 +0900)
--HG--
branch : stable
Filters/Merge_VC_loose.flt
patch
|
blob
|
history
diff --git
a/Filters/Merge_VC_loose.flt
b/Filters/Merge_VC_loose.flt
index
e245b7c
..
ef53854
100644
(file)
--- a/
Filters/Merge_VC_loose.flt
+++ b/
Filters/Merge_VC_loose.flt
@@
-18,7
+18,7
@@
f: \.dll$ ## Windows DLL
f: \.exe$ ## Windows/DOS executable
f: \.exp$ ## VC library export file
f: ^BuildLog.htm$ ## VC build log file
f: \.exe$ ## Windows/DOS executable
f: \.exp$ ## VC library export file
f: ^BuildLog.htm$ ## VC build log file
-f: ^vc
[4-9]0
\.idb$ ## VC Minimal rebuild dependency file
+f: ^vc
\d+
\.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)
f: \.ilk$ ## VC incremental linker memory file
f: \.lib$ ## compiled libraries
f: \.ncb$ ## VC parser information file (class view & component gallery stuff)
@@
-31,6
+31,7
@@
f: \.suo$ ## VC options file (binary)
f: \.ncb$ ## VC Intellisense file
f: \.opt$ ## VC project options file
f: \.bak$ ## backup
f: \.ncb$ ## VC Intellisense file
f: \.opt$ ## VC project options file
f: \.bak$ ## backup
+f: \.sdf$ ## SQL Server Compact Edition Database File
d: \\\.svn$ ## Subversion working copy
d: \\_svn$ ## Subversion working copy ASP.NET Hack
d: \\\.svn$ ## Subversion working copy
d: \\_svn$ ## Subversion working copy ASP.NET Hack
@@
-38,4
+39,5
@@
d: \\cvs$ ## CVS control directory
d: \\\.git$ ## Git directory
d: \\\.bzr$ ## Bazaar branch
d: \\\.hg$ ## Mercurial repository
d: \\\.git$ ## Git directory
d: \\\.bzr$ ## Bazaar branch
d: \\\.hg$ ## Mercurial repository
+d: \\ipch$ ## Intellisense cache for precompiled header file