Merge 71823a71a3 into b4105e73e4

Merge branch 'main' into patch-3
Fix macOS rule for Icon file exclusion
2026-08-30 11:47:22 +02:00 · 2026-02-13 22:18:27 +00:00 · 2025-09-17 18:34:18 +02:00 · 2022-07-07 14:59:22 +02:00
1 changed files with 25 additions and 25 deletions
--- a/Global/macOS.gitignore
+++ b/Global/macOS.gitignore
@ -1,25 +1,25 @@
-# General
-.DS_Store
-__MACOSX/
-.AppleDouble
-.LSOverride
-Icon[
]
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
+# General
+.DS_Store
+__MACOSX/
+.AppleDouble
+.LSOverride
+Icon[\r]
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
Author	SHA1	Message	Date
Walter Purcaro	a9e40e4cfe	Merge `71823a71a3` into `b4105e73e4`	2026-02-13 22:18:27 +00:00
Walter Purcaro	71823a71a3	Merge branch 'main' into patch-3	2025-09-17 18:34:18 +02:00
Walter Purcaro	256998a92d	Fix macOS rule for Icon file exclusion	2022-07-07 14:59:22 +02:00