# 
# patch "ChangeLog"
#  from [0c2b9b019d8e0d9440074af1db437cd3b7a143c1]
#    to [46ced699d4574f6312d70d99481216384ceb156f]
# 
# patch "std_hooks.lua"
#  from [6374fb70133efbd8c51a1ba6a65e3de67d28ae42]
#    to [1cc11534ca3c3a7c0411de4c5cc3346f33382569]
# 
========================================================================
--- ChangeLog	0c2b9b019d8e0d9440074af1db437cd3b7a143c1
+++ ChangeLog	46ced699d4574f6312d70d99481216384ceb156f
@@ -1,3 +1,8 @@
+2005-09-06  Matthew Gregan  <address@hidden>
+
+	* std_hooks.lua (ignore_file): Add Mac OS X (.DS_Store) and
+	Windows (desktop.ini) per-directory browser configuration files.
+
 2005-09-05  Matthew Gregan  <address@hidden>
 
 	* win32/terminal.cc (have_smart_terminal): We were returning false
========================================================================
--- std_hooks.lua	6374fb70133efbd8c51a1ba6a65e3de67d28ae42
+++ std_hooks.lua	1cc11534ca3c3a7c0411de4c5cc3346f33382569
@@ -134,6 +134,11 @@
    if (string.find(name, "^.cdv/")) then return true end
    if (string.find(name, "^.git/")) then return true end
    if (string.find(name, "%.scc$")) then return true end
+   -- desktop/directory configuration metadata
+   if (string.find(name, "^.DS_Store$")) then return true end
+   if (string.find(name, "/.DS_Store$")) then return true end
+   if (string.find(name, "^desktop.ini$")) then return true end
+   if (string.find(name, "/desktop.ini$")) then return true end
    return false;
 end