Merge pull request #804 from rutice/osx

Fix OSX-specific Icon\r rule

Merge pull request #804 from rutice/osx
Fix OSX-specific Icon\r rule
8480473d · Adam Roben · 7a40a390 · da36175f · 8480473d
Commit 8480473d authored Nov 04, 2013 by Adam Roben
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

OSX.gitignore Global/OSX.gitignore +2 -1

No files found.
--- a/Global/OSX.gitignore
+++ b/Global/OSX.gitignore
 .DS_Store
 .AppleDouble
 .LSOverride
-Icon
+# Icon must ends with two \r.
+Icon
 # Thumbnails
 ._*