X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=.gitignore;h=6dddde8747a16814bd8b9087a119777882ea063a;hb=fcf37721e1f2bf6dcf3a622bdce1367a59c5f8f6;hp=e16dff18afd9df21211101d333b907d542bc8baf;hpb=971d43980dddd6831b0ad4e51a0fdc036a124eb0;p=winmerge-jp%2Fwinmerge-jp.git

diff --git a/.gitignore b/.gitignore
index e16dff18a..6dddde874 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,3 @@
-
-**/.vs
-**/ipch
-
-**/BuildTmp
-**/Build
-**/obj64
-**/obj
-**/lib64
-**/lib
-**/x64Release
-**/Release
-**/x64Debug
-**/Debug
-
 *.exe
 *.dll
 *.pdb
@@ -23,10 +8,66 @@
 *.ilk
 *.aps
 *.tlb
-
+*.vspx
+*.vsp
+*.psess
+*.cppcheck
+*.un~
+*.*~
+*.obj
+*.res
+*.tlog
+*.pch
+*.idb
+*.log
+*.diagsession
+*.asm
+*.swp
+**/.vs
+**/ipch
+**/BuildTmp
+**/Build
+**/objARM64
+**/obj64
+**/obj
+**/libARM64
+**/lib64
+**/lib
+**/Release
+**/Debug
+**/DebugU
+**/Release*MinDependency
+**/Release*MinSize
+**/Unicode Debug
+**/Unicode Release
+**/Unicode Release*MinDependency
+**/Unicode Release*MinSize
+**/ARM64Release
+**/ARM64Debug
+**/x64Release
+**/x64Debug
+winmerge-cppcheck-build-dir/
+Docs/Manual/Tools/ReadMe_ENG.html
 Testing/Data/ShellFileOpTest/File1.txt
+Testing/result-*.txt
 Translations/WinMerge/MergeLang.lastbuild
-/ShellExtension/dlldata.c
-/ShellExtension/ShellExtension.h
-/ShellExtension/ShellExtension_i.c
-/ShellExtension/ShellExtension_p.c
+ShellExtension/*_i.c
+ShellExtension/*_p.c
+ShellExtension/dlldata.c
+ShellExtension/ShellExtension.h
+ShellExtension/ShellExtension_i.c
+ShellExtension/ShellExtension_p.c
+Plugins/**/dlldata.c
+Plugins/**/*_i.c
+Plugins/**/*_i.h
+Plugins/**/*_p.c
+Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.h
+Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.h
+Plugins/src_VCPP/HideFirstLetter/HideFirstLetter.h
+Plugins/src_VCPP/EditBinaryFiles/EditBinaryFiles.h
+Plugins/src_VCPP/IgnoreColumns/IgnoreColumns.h
+Plugins/src_VCPP/IgnoreCommentsC/IgnoreCommentsC.h
+Plugins/src_VCPP/IgnoreFieldsComma/IgnoreFieldsComma.h
+Plugins/src_VCPP/IgnoreFieldsTab/IgnoreFieldsTab.h
+Plugins/src_VCPP/WatchBeginningOfLog/WatchBeginningOfLog.h
+Plugins/src_VCPP/WatchEndOfLog/WatchEndOfLog.h