Merge pull request #783 from Dschee/master

Add Workspace and Frameworks project (Carthage Support)
nicklockwood · Feb 17, 2017 · c9e043e · c9e043e
2 parents f042f8c + f0272c2
commit c9e043e
Show file tree

Hide file tree

Showing 14 changed files with 653 additions and 599 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,7 +9,6 @@ build/
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-*.xcworkspace
 !default.xcworkspace
 xcuserdata
 profile

diff --git a/... Demo/iCarouselButtonsDemo.xcodeproj/xcshareddata/xcschemes/iCarouselButtonsDemo.xcscheme b/... Demo/iCarouselButtonsDemo.xcodeproj/xcshareddata/xcschemes/iCarouselButtonsDemo.xcscheme
diff --git a/...ontrols Demo/iCarouselControlsDemo.xcodeproj/xcshareddata/xcschemes/ControlsDemo.xcscheme b/...ontrols Demo/iCarouselControlsDemo.xcodeproj/xcshareddata/xcschemes/ControlsDemo.xcscheme
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/...arouselReflectionsDemo.xcodeproj/xcshareddata/xcschemes/iCarouselReflectionsDemo.xcscheme b/...arouselReflectionsDemo.xcodeproj/xcshareddata/xcschemes/iCarouselReflectionsDemo.xcscheme
diff --git a/...e Carousels/MultipleCarousels.xcodeproj/xcshareddata/xcschemes/MultipleCarousels.xcscheme b/...e Carousels/MultipleCarousels.xcodeproj/xcshareddata/xcschemes/MultipleCarousels.xcscheme