Skip to content

Commit

Permalink
Fix crlf line endings
Browse files Browse the repository at this point in the history
mark .icns files as binary so git will stop trying to fix the line
endings, and recommit the remaining .crlf files
  • Loading branch information
dcbaker authored and jpakkane committed Oct 29, 2018
1 parent fe3efe0 commit d505a68
Show file tree
Hide file tree
Showing 3 changed files with 91 additions and 90 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
.gitattributes export-ignore
* text eol=lf
*.png binary
*.icns binary
36 changes: 18 additions & 18 deletions manual tests/4 standalone binaries/myapp.iss
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
; Innosetup file for My app.

[Setup]
AppName=My App
AppVersion=1.0
DefaultDirName={pf}\My App
DefaultGroupName=My App
UninstallDisplayIcon={app}\myapp.exe
Compression=lzma2
SolidCompression=yes
OutputDir=.

[Files]
Source: "myapp.exe"; DestDir: "{app}"
Source: "SDL2.dll"; DestDir: "{app}"

;[Icons]
;Name: "{group}\My App"; Filename: "{app}\myapp.exe"
; Innosetup file for My app.

[Setup]
AppName=My App
AppVersion=1.0
DefaultDirName={pf}\My App
DefaultGroupName=My App
UninstallDisplayIcon={app}\myapp.exe
Compression=lzma2
SolidCompression=yes
OutputDir=.

[Files]
Source: "myapp.exe"; DestDir: "{app}"
Source: "SDL2.dll"; DestDir: "{app}"

;[Icons]
;Name: "{group}\My App"; Filename: "{app}\myapp.exe"
Loading

0 comments on commit d505a68

Please sign in to comment.