diff --git a/.gitattributes b/.gitattributes index 59edef6f..a5c4a188 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,4 @@ -* text=auto -*.swift text eol=lf +* text=auto eol=lf *.pdf binary *.ai binary *.psd binary diff --git a/.gitignore b/.gitignore index 9acd6cae..8b53cbff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ xcuserdata project.xcworkspace -Carthage/Build diff --git a/Gifski.xcodeproj/project.pbxproj b/Gifski.xcodeproj/project.pbxproj index 4abe3cc0..71eec475 100644 --- a/Gifski.xcodeproj/project.pbxproj +++ b/Gifski.xcodeproj/project.pbxproj @@ -128,6 +128,17 @@ path = Vendor; sourceTree = ""; }; + E356A15D21028942000148AD /* Other */ = { + isa = PBXGroup; + children = ( + E3FD6190201BCBC30087160A /* Gifski-Bridging-Header.h */, + E3C3DB4E203F154300CB8BB9 /* Credits.rtf */, + E3AE628D1E5CD2F300035A2F /* Info.plist */, + E3BF14CC1E5CD5A30049FD4B /* Gifski.entitlements */, + ); + name = Other; + sourceTree = ""; + }; E3AE627A1E5CD2F300035A2F = { isa = PBXGroup; children = ( @@ -160,10 +171,7 @@ E3D08F6D1E5D7BFD00F465DF /* util.swift */, E3AE628A1E5CD2F300035A2F /* MainMenu.xib */, E3AE62881E5CD2F300035A2F /* Assets.xcassets */, - E3AE628D1E5CD2F300035A2F /* Info.plist */, - E3BF14CC1E5CD5A30049FD4B /* Gifski.entitlements */, - E3FD6190201BCBC30087160A /* Gifski-Bridging-Header.h */, - E3C3DB4E203F154300CB8BB9 /* Credits.rtf */, + E356A15D21028942000148AD /* Other */, E317FF182057E25400A80A18 /* Vendor */, ); path = Gifski; diff --git a/Gifski/Info.plist b/Gifski/Info.plist index 6e90ad19..53c853ed 100644 --- a/Gifski/Info.plist +++ b/Gifski/Info.plist @@ -2,8 +2,6 @@ - CFBundleDevelopmentRegion - en CFBundleDocumentTypes @@ -43,11 +41,11 @@ public.app-category.video LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) - MDItemKeywords - gif,convert,video NSMainNibFile MainMenu NSPrincipalClass NSApplication + MDItemKeywords + gif,convert,video