Skip to content

Commit

Permalink
Merge branch 'feature-20'
Browse files Browse the repository at this point in the history
  • Loading branch information
@glushchenko
glushchenko committed Aug 25, 2017
2 parents fda1274 + 5472606 commit b8b540d
Show file tree
Hide file tree
Showing 9 changed files with 233 additions and 271 deletions.
18 changes: 12 additions & 6 deletions FSNotes.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

/* Begin PBXBuildFile section */
275592971F3AE9B5006B8988 /* MainWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 275592961F3AE9B5006B8988 /* MainWindowController.swift */; };
6F2592741F39913200307D71 /* SourceCodePro-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6F2592731F39913200307D71 /* SourceCodePro-Regular.ttf */; };
A6BB525ADACCB8B7AD00BF5E /* libPods-FSNotes.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B1958E38FE51AAED6005C898 /* libPods-FSNotes.a */; };
D7166F531F32F751001A883F /* icons.icns in Resources */ = {isa = PBXBuildFile; fileRef = D735E5B81F2E45CC00173215 /* icons.icns */; };
D7166F541F32F75E001A883F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D7793C781F211C6000CA39B7 /* Main.storyboard */; };
Expand All @@ -29,6 +28,9 @@
D7A415141F2FBDA00099B82C /* NotesTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7A415131F2FBDA00099B82C /* NotesTableView.swift */; };
D7D3D5181F44799400D152FE /* makeNote.png in Resources */ = {isa = PBXBuildFile; fileRef = D7D3D5171F44794A00D152FE /* makeNote.png */; };
D7D3D51A1F4483F500D152FE /* pin.png in Resources */ = {isa = PBXBuildFile; fileRef = D7D3D5191F4483EA00D152FE /* pin.png */; };
D7DD79581F4E60D000D5724B /* SourceCodePro-Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D7DD79561F4E606600D5724B /* SourceCodePro-Black.ttf */; };
D7DD79591F4E60D000D5724B /* SourceCodePro-It.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D7DD79551F4E606600D5724B /* SourceCodePro-It.ttf */; };
D7DD795B1F4E611D00D5724B /* SourceCodePro-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D7DD795A1F4E611200D5724B /* SourceCodePro-Regular.ttf */; };
D7E025081F3B6DDB00EDDA32 /* Storage.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7E025071F3B6DDB00EDDA32 /* Storage.swift */; };
/* End PBXBuildFile section */

Expand All @@ -53,9 +55,7 @@
119660667AFC00E2FC48D23C /* Pods-FSNotes.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FSNotes.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FSNotes/Pods-FSNotes.debug.xcconfig"; sourceTree = "<group>"; };
275592961F3AE9B5006B8988 /* MainWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainWindowController.swift; sourceTree = "<group>"; };
310C5FB081DABFC536EC197F /* Pods-FSNotes.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FSNotes.release.xcconfig"; path = "Pods/Target Support Files/Pods-FSNotes/Pods-FSNotes.release.xcconfig"; sourceTree = "<group>"; };
6F2592731F39913200307D71 /* SourceCodePro-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "SourceCodePro-Regular.ttf"; path = "Resources/SourceCodePro-Regular.ttf"; sourceTree = "<group>"; };
B1958E38FE51AAED6005C898 /* libPods-FSNotes.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-FSNotes.a"; sourceTree = BUILT_PRODUCTS_DIR; };
D7166F871F330A64001A883F /* SourceCodePro-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "SourceCodePro-Regular.ttf"; path = "../../../Downloads/source-code-pro-2.030R-ro-1-2.050R-it/TTF/SourceCodePro-Regular.ttf"; sourceTree = "<group>"; };
D735E5AB1F2E027D00173215 /* Note.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Note.swift; sourceTree = "<group>"; };
D735E5B81F2E45CC00173215 /* icons.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = icons.icns; sourceTree = "<group>"; };
D735E5BC1F2EF66000173215 /* NoteCellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteCellView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -83,6 +83,9 @@
D7A415131F2FBDA00099B82C /* NotesTableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotesTableView.swift; sourceTree = "<group>"; };
D7D3D5171F44794A00D152FE /* makeNote.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = makeNote.png; sourceTree = "<group>"; };
D7D3D5191F4483EA00D152FE /* pin.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pin.png; sourceTree = "<group>"; };
D7DD79551F4E606600D5724B /* SourceCodePro-It.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SourceCodePro-It.ttf"; sourceTree = "<group>"; };
D7DD79561F4E606600D5724B /* SourceCodePro-Black.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SourceCodePro-Black.ttf"; sourceTree = "<group>"; };
D7DD795A1F4E611200D5724B /* SourceCodePro-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SourceCodePro-Regular.ttf"; sourceTree = "<group>"; };
D7E025071F3B6DDB00EDDA32 /* Storage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Storage.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -144,7 +147,6 @@
D7793C661F211C6000CA39B7 = {
isa = PBXGroup;
children = (
6F2592731F39913200307D71 /* SourceCodePro-Regular.ttf */,
D7D61FCC1F32EEA1004357C2 /* Resources */,
D7793C711F211C6000CA39B7 /* FSNotes */,
D7793C841F211C6000CA39B7 /* FSNotesTests */,
Expand Down Expand Up @@ -208,7 +210,9 @@
D7D61FCC1F32EEA1004357C2 /* Resources */ = {
isa = PBXGroup;
children = (
D7166F871F330A64001A883F /* SourceCodePro-Regular.ttf */,
D7DD79561F4E606600D5724B /* SourceCodePro-Black.ttf */,
D7DD79551F4E606600D5724B /* SourceCodePro-It.ttf */,
D7DD795A1F4E611200D5724B /* SourceCodePro-Regular.ttf */,
D735E5B81F2E45CC00173215 /* icons.icns */,
D7D3D5191F4483EA00D152FE /* pin.png */,
D7D3D5171F44794A00D152FE /* makeNote.png */,
Expand Down Expand Up @@ -331,10 +335,12 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
D7DD795B1F4E611D00D5724B /* SourceCodePro-Regular.ttf in Resources */,
D7DD79581F4E60D000D5724B /* SourceCodePro-Black.ttf in Resources */,
D7DD79591F4E60D000D5724B /* SourceCodePro-It.ttf in Resources */,
D7D3D51A1F4483F500D152FE /* pin.png in Resources */,
D7D3D5181F44799400D152FE /* makeNote.png in Resources */,
D7166F541F32F75E001A883F /* Main.storyboard in Resources */,
6F2592741F39913200307D71 /* SourceCodePro-Regular.ttf in Resources */,
D7166F531F32F751001A883F /* icons.icns in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
Loading

0 comments on commit b8b540d

Please sign in to comment.