Merge 71823a71a3 into 84c6914a9b

Merge branch 'main' into patch-3
Fix macOS rule for Icon file exclusion
2026-11-07 18:40:50 +01:00 · 2026-04-04 09:15:16 +00:00 · 2025-09-17 18:34:18 +02:00 · 2022-07-07 14:59:22 +02:00
4 changed files with 2 additions and 11 deletions
@@ -1,10 +1,9 @@
 # General
 .DS_Store
 .localized
 __MACOSX/
 .AppleDouble
 .LSOverride
-Icon[␍]
+Icon[\r]
 # Thumbnails
 ._*
@@ -7,7 +7,7 @@ release.properties
 dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
-# https://maven.apache.org/tools/wrapper/#Usage_with_or_without_Binary_JAR
+# https://maven.apache.org/wrapper/#usage-without-binary-jar
 .mvn/wrapper/maven-wrapper.jar
 # Eclipse m2e generated files
@@ -4,6 +4,3 @@ result-*
 # Ignore automatically generated direnv output
 .direnv
 # Ignore NixOS interactive test driver history
 **/.nixos-test-history
@@ -75,11 +75,6 @@ acs-*.bib
 # comment
 *.cut
 # context
 *.tuc
 *.tui
 *.tuo
 # cprotect
 *.cpt
Author	SHA1	Message	Date
Walter Purcaro	13de1383fe	Merge `71823a71a3` into `84c6914a9b`	2026-04-04 09:15:16 +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